diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
       fprintf(stderr, "Error connecting to server; exiting\n");
       return 1;
     }
-
+  greet_server(comm_slave);
 
   // Variables needed for main loop
   int jobnum = 0;
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
     {
 
     // request work
-    fprintf(stderr,"Requesting work...\n");
+    fprintf(stderr, "Waiting...\n");
     haveWork = getwork(comm_slave, &jobnum, &framenum);
 
     /* If we got a frame */
@@ -301,10 +301,14 @@ int main(int argc, char *argv[])
         fprintf(stderr,"Nothing to do. Idling...\n");
       else
         fprintf(stderr,".");
-      sleep(300); // Poll every 300 seconds @TODO: remove polling
+
+      /**
+	 to prevent infinite loops from burning CPU, we just sleep(1) ;-)
+      */
+      sleep(1);
     }
 
-    // @TODO: If the server says that every frame for the last jobnum is finished, OR if the data is getting old
+    /* @TODO: If the server says that every frame for the last jobnum is finished, OR if the data is getting old */
     if(1 == 0)
       {
         // Note: individual frames are already deleted after uploading,