diff --git a/botthread.c b/botthread.c
index 111df9a..40c646f 100644
--- a/botthread.c
+++ b/botthread.c
@@ -291,7 +291,7 @@
     sprintf(tmpChan->videoChanTitle,"%s's Pick -> <A HREF=\"event:%i\"><FONT COLOR=\"#8080FF\">[%s - %s]</FONT></A>",nick,vid,artist,title);
   sprintf(tmpChan->videoTitle,"%s - %s",artist,title);
 
-  sprintf(output,"CURPOS:0:%s:%s:%i:%i\n",file,tmpChan->videoTitle,length,vid);
+  sprintf(output,"CURPOS:%s:0:%s:%s:%i:%i\n",tmpChan->channel,file,tmpChan->videoTitle,length,vid);
   writeLog(0,"[%s][%s]\n",output,channel);
   tuveSendAllInChan(channel,0x0,output);
 
diff --git a/channel.c b/channel.c
index b4a9ac7..891e027 100644
--- a/channel.c
+++ b/channel.c
@@ -80,7 +80,7 @@
 
   tmpChan->modes[CHAN_LIVE] = 0x1;
 
-  sprintf(output,"CURPOS:-1:%s:Live Stream:0:0\n",stream);
+  sprintf(output,"CURPOS:%s:-1:%s:Live Stream:0:0\n",tmpChan->channel,stream);
   tuveSendAllInChan(channel,0x0,output);
   return(0x0);
   } /* End int tuveChanLive(channel,stream) */
@@ -95,7 +95,7 @@
 
   tmpChan->modes[CHAN_LIVE] = 0x0;
   
-  sprintf(output,"CURPOS:%i:%s:%s:%i:%i\n",tmpChan->videoTime - (tmpChan->videoEnd - (time(NULL) + VIDE_PAD_TIME)),tmpChan->videoFile,tmpChan->videoTitle,tmpChan->videoTime,tmpChan->vid);
+  sprintf(output,"CURPOS:%s:%i:%s:%s:%i:%i\n",tmpChan->channel,tmpChan->videoTime - (tmpChan->videoEnd - (time(NULL) + VIDE_PAD_TIME)),tmpChan->videoFile,tmpChan->videoTitle,tmpChan->videoTime,tmpChan->vid);
   tuveSendAllInChan(channel,0x0,output);
   return(0x0);
   }
@@ -132,10 +132,10 @@
   assert(tmpChan);
 
   if (tmpChan->modes[CHAN_LIVE] == 1) {
-    sSendData(userConnection,"CURPOS:-1:%s:Live Stream:0:0\n",tmpChan->liveStream);
+    sSendData(userConnection,"CURPOS:%s:-1:%s:Live Stream:0:0\n",tmpChan->channel,tmpChan->liveStream);
     }
   else {
-    sSendData(userConnection,"CURPOS:%i:%s:%s:%i:%i\n",tmpChan->videoTime - (tmpChan->videoEnd - (time(NULL) + VIDE_PAD_TIME)),tmpChan->videoFile,tmpChan->videoTitle,tmpChan->videoTime,tmpChan->vid);
+    sSendData(userConnection,"CURPOS:%s:%i:%s:%s:%i:%i\n",tmpChan->channel,tmpChan->videoTime - (tmpChan->videoEnd - (time(NULL) + VIDE_PAD_TIME)),tmpChan->videoFile,tmpChan->videoTitle,tmpChan->videoTime,tmpChan->vid);
 
     min = tmpChan->videoTime / 60;
     sec = tmpChan->videoTime % 60;
@@ -279,7 +279,6 @@
 
   char output[1024];
   char nick[MAX_USER_LEN + 1];
-  char topicTime[128];
  
   tmpChannel = findChan(channel);
 
@@ -348,9 +347,7 @@
   sprintf(output,"MSG:TUveD:%s:Topic for %s: %s\n",tmpChannel->channel,tmpChannel->channel,tmpChannel->topic);
   sSendData(userConnection,output);
 
-  formatTime(time(NULL) - tmpChannel->topicSet,topicTime);
-
-  sprintf(output,"MSG:TUveD:%s:Topic was set by %s %s seconds ago.\n",tmpChannel->channel,tmpChannel->topicSetBy, topicTime);
+  sprintf(output,"MSG:TUveD:%s:Topic was set by %s on %s.\n",tmpChannel->channel,tmpChannel->topicSetBy, ctime(&tmpChannel->topicSet));
   sSendData(userConnection,output);
 
   if (tmpChannel->modes[CHAN_TIME] == 1) {