general cleanup + add -C and -c
diff --git a/communication.c b/communication.c
index f712b2b..e93217a 100644
--- a/communication.c
+++ b/communication.c
@@ -362,6 +362,7 @@
 			old++;
 			/* We've set a new counter */
 			new++;
+			next = next->next;
 		} else if (cc->type == CNT_DEL) {
 			/* Don't use this old counter */
 			old++;
@@ -373,9 +374,9 @@
 				old++;
 				new++;
 			}
+			next = next->next;
 		}
 		cc = cc->next;
-		next = next->next;
 	}
 
 	free(u_repl->counters);