diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
old mode 100644
new mode 100755
index 86bcce0..93b9b23
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -291,7 +291,10 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
     
     (void)parameter;
     rb=api;
-    rb->memset(&settings, 0, sizeof(settings));
+
+    settings.nr_timers = 1;
+    settings.total_time = 0;
+    settings.round_time = 0;
     
     /* now go ahead and have fun! */
     rb->splash(HZ, "Chess Clock");
@@ -347,17 +350,22 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
     do {
         int ret=0;
         done=true;
-        for (i=0; done && i<settings.nr_timers; i++) {
+        i = nr;
+        do {
             if (!timer_holder[i].hidden)
-                done=false;
-        }
+            {
+                nr = i;
+                done = false;
+                break;
+            }
+            if (++i == settings.nr_timers)
+                i = 0;
+        } while (i != nr);
+
         if (done) {
             return PLUGIN_OK;
         }
-        if (!timer_holder[nr].hidden) {
-            done=false;
-            ret=run_timer(nr);
-        }
+        ret = run_timer(nr);
         switch (ret) {
             case -1: /* exit */
                 done=true;
@@ -502,19 +510,18 @@ static int run_timer(int nr)
                     done=true;
                 } else if (ret==-2) {
                 } else if (ret==0) {
-                     /* delete timer */
+                     /* delete player */
                     timer_holder[nr].hidden=true;
                     retval=1;
                     done=true;
-                    break;
                 } else if (ret==1) {
                     /* restart */
                     ticks=0;
-                    break;
+                    last_tick = *rb->current_tick;
                 } else if (ret==2) {
                     /* set round time */
                     int res;
-                    int val=(max_ticks-ticks)/HZ;
+                    int val = (max_ticks > ticks)? (max_ticks-ticks)/HZ : 0;
                     res=chessclock_set_int("Round time",
                                            &val,
                                            10, 0, MAX_TIME,
@@ -540,6 +547,7 @@ static int run_timer(int nr)
                         timer_holder[nr].total_time=val;
                     }
                 }
+                rb->lcd_puts(0, FIRST_LINE, (unsigned char *)player_info);
             }
             break;