diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -156,7 +156,7 @@ void start_data(){
 // **** Finish-Setter: Sets a frame to the "completed" status.
 void finish_frame(struct blendjob *blendjob, int frame){
   blendjob->frameset[frame].status = 2;
-  blendjob->frameset[frame].time_to_render = (clock() - blendjob[jobnum].frameset[frame].start_time); // Consider changin time-to-render to time-for-frame or something?
+  blendjob->frameset[frame].time_to_render = (clock() - blendjob[jobnum].frameset[frame].start_time); // Consider changing time-to-render to time-for-frame or something?
 
   general_info.total_frames_rendered++; // Increase total frames var for stats
 }
@@ -506,12 +506,12 @@ int main(int argc, char *argv[])
       status_report_generator(); // TODO: Add correct args
       blend_frame_watchdog();	 // TODO: Add correct args
 
-// TODO: Okay, so the slave really needs 3 statuses, not just "idle" and "working" so the server can tell when it finishes a frame
-int iteration; // We shouldn't need this.
-int framenum;
-int jobnum;
-      /* If the client is idle */
-      	if(clientstatus == DISTREN_REQUEST_DONEFRAME && iteration > 0){
+
+      int framenum;
+      int jobnum;
+
+      /* If the client is idle (meaning a client without the "busy" status connected via ssh) */
+      	if(clientstatus == idle && iteration > 0){
       		framenum = frame_finder(); // give framefinder args, framefinder should return job number and frame number
       		jobnum = frame_finder();
       		remotio_send_to_client(framenum);