--- a/skillbot.pl	Sat Dec 06 15:29:45 2008 +0000
+++ b/skillbot.pl	Sat Dec 06 15:47:34 2008 +0000
@@ -171,7 +171,7 @@
 sub join_channels
 {
 	my $self = shift;
-    $self->join('#' . $config{channel});
+    $self->join('#' . $config{channel}, $config{chankey});
 }
 
 sub on_join
@@ -328,12 +328,12 @@
 
 =pod
 
-Read a list of friends from the friends_file.  These will be friended in
-Twitter if they aren't already.  Format is:
+Read a list of friends from the friends_file.  Format is:
 
-character_name	user_id	api_key		IRC_nick
+user_id	api_key		IRC_nick	character_name
 
-Start a line with # for a comment.  Columns must be tab separated.
+Start a line with # for a comment.  Character name is optional, if left
+out then all characters will be monitored.
 
 =cut
 sub update_friends
@@ -401,9 +401,9 @@
 		# Nothing training
 		next unless $skill;
 
-		irc_debug("Character %s is training %s (%s)",
-				  $f->{char}->name, $skill->name,
-				  $skill->time_remaining);
+		irc_debug("Character %s is training %s %lu (%s == %lu sec)",
+				  $f->{char}->name, $skill->name, $skill->level,
+				  $skill->time_remaining, ($skill->finish_time - time()));
 
 		$f->{skill} = $skill;