diff --git a/src/gmcp.tin b/src/gmcp.tin
index fbbc319..4590e13 100644
--- a/src/gmcp.tin
+++ b/src/gmcp.tin
@@ -58,7 +58,6 @@
     #VAR GMCP[room][info] {%0};
 
     /spottimercheckroomid $GMCP[room][info][identifier]
-    #nop Run our spot timer logic against new identifier
 }
 
 #EVENT {IAC SB GMCP room.map IAC SE}
diff --git a/src/group.tin b/src/group.tin
index b9af0b7..2c2e863 100644
--- a/src/group.tin
+++ b/src/group.tin
@@ -49,11 +49,11 @@
 
 #nop No shields at all
 #ACTION {^{(\w+\b\W*?){1,8}} has no arcane protection.$} {
-    #variable {group_shields[$group_shields_current][ccc]} {0};
-    #variable {group_shields[$group_shields_current][tpa]} {0};
-    #variable {group_shields[$group_shields_current][eff]} {0};
-    #variable {group_shields[$group_shields_current][kii]} {0};
-    #variable {group_shields[$group_shields_current][ms]} {0};
+    #variable {group_shields[%1][ccc]} {0};
+    #variable {group_shields[%1][tpa]} {0};
+    #variable {group_shields[%1][eff]} {0};
+    #variable {group_shields[%1][kii]} {0};
+    #variable {group_shields[%1][ms]} {0};
     /writegroupshieldstofile
 };
 
diff --git a/src/magic.tin b/src/magic.tin
index 85caed9..066cac9 100644
--- a/src/magic.tin
+++ b/src/magic.tin
@@ -53,7 +53,7 @@
 
 
 #NOP ==[Colour FCI Output]==
-#SUB {The weave indicates that %1 is a %2, with %3 charges remaining.} {The weave indicates that <138>%1<098> is a <138>%2<098> with <158>%3<098> charges remaining.};
+#SUB {The weave indicates that %1 is a %2, with %3 charge{s?} remaining.} {The weave indicates that <138>%1<098> is a <138>%2<098> with <158>%3<098> charges remaining.};
 
 #NOP ==[Library/Distortions]==
 #HIGHLIGHT {^The area seems more mundane than before\.$} {green underscore};
diff --git a/src/quota.tin b/src/quota.tin
index 3ad109c..753ef02 100644
--- a/src/quota.tin
+++ b/src/quota.tin
@@ -87,7 +87,7 @@
 		#var {quota[reciepts]} {0};
 
         #nop Quota period is over, announce it.;
-        #format {quota_display_line} {%c[Quota] %c*%c %s's quota has %creset%c.} {bold blue} {bold yellow} {bold blue} {$quota[who]} {bold red} {bold blue};
+        #format {quota_display_line} {%c[Quota] %c*%c %s's quota has %creset%c.<099>} {bold blue} {bold yellow} {bold blue} {$quota[who]} {bold red} {bold blue};
 		#showme {$quota_display_line};
 	};
 
@@ -95,19 +95,19 @@
     #if {"$quota[alert]" == "on"} {
         #nop Message an hour before;
         #if {$quota[time][hour] == 0 && $quota[time][min] == 59 && $quota[time][sec] == 59} {
-            #format {quota_display_line} {%c[Quota] %c*%c %s's quota flips over in %cone hour%c.} {bold blue} {bold yellow} {bold blue} {$quota[who]} {bold red} {bold blue};
+            #format {quota_display_line} {%c[Quota] %c*%c %s's quota flips over in %cone hour%c.<099>} {bold blue} {bold yellow} {bold blue} {$quota[who]} {bold red} {bold blue};
             #echo {$quota_display_line \a};
         };
 
         #nop Message 30 minutes before;
         #if {$quota[time][hour] == 0 && $quota[time][min] == 29 && $quota[time][sec] == 59} {
-            #format {quota_display_line} {%c[Quota] %c*%c %s's quota flips over in %chalf an hour%c.} {bold blue} {bold yellow} {bold blue} {$quota[who]} {bold red} {bold blue};
+            #format {quota_display_line} {%c[Quota] %c*%c %s's quota flips over in %chalf an hour%c.<099>} {bold blue} {bold yellow} {bold blue} {$quota[who]} {bold red} {bold blue};
             #echo {$quota_display_line \a};
         };
 
         #nop Message 10 minutes before;
         #if {$quota[time][hour] == 0 && $quota[time][min] == 9 && $quota[time][sec] == 59} {
-            #format {quota_display_line} {%c[Quota] %c*%c %s's quota flips over in %cten minutes%c.} {bold blue} {bold yellow} {bold blue} {$quota[who]} {bold red} {bold blue};
+            #format {quota_display_line} {%c[Quota] %c*%c %s's quota flips over in %cten minutes%c.<099>} {bold blue} {bold yellow} {bold blue} {$quota[who]} {bold red} {bold blue};
             #echo {$quota_display_line \a};
         };
     };