--- a/ggrtf-nun.tf	Sun Nov 26 18:39:07 2006 +0000
+++ b/ggrtf-nun.tf	Tue Nov 28 06:38:35 2006 +0000
@@ -29,25 +29,21 @@
 ;; Fails & fumbles
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /prdeffail -c -F    -t"Your halo crackles as you fumble the spell."
-
 /prdeffail -k -F -r -t"^OOPS, You should have used a pattern"
-
 /prdeffail -k -f    -t"You fail to channel your god's power."
 /prdeffail -k -f    -t"OUCH, you poke yourself with your needle."
 
 
-
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Warnings about turn rate
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /set nun_turn_warn=1
 
-;; Sudden enlightment takes over you.
-;; Archangel Zaylie whispers in your ear, 'You should turn more undeads'
-;; Sudden enlightment takes over you.
-;; Archangel Falynn speaks to you, 'Las is not pleased. You should turn more
-;; undeads'
+; Sudden enlightment takes over you.
+; Archangel Zaylie whispers in your ear, 'You should turn more undeads'
+; Sudden enlightment takes over you.
+; Archangel Falynn speaks to you, 'Las is not pleased. You should turn more
+; undeads'
 /def -i -ag -mregexp -t"^Archangel .*You should turn more" gnun_turn_more =\
 	/if (nun_turn_warn >= 1)\
 		/mse should turn more undeads. [one warning left]%;\
@@ -173,24 +169,24 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Task timer
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-/set gnun_task_n=
-/set gnun_task_t=0
-/set gnun_task_c=0
+/set nun_task_n=
+/set nun_task_t=0
+/set nun_task_c=0
 
-/def task =\
-	/if (gnun_task_t > 0)\
-		/msq @{BCgreen}Nun task:@{n} '@{Ccyan}%{gnun_task_n}@{n}' @{Cyellow}$[prgetstime(gnun_task_t)]@{n}%;\
+/def ntask =\
+	/if (nun_task_t > 0)\
+		/msq @{BCgreen}Nun task@{n} '@{Ccyan}%{nun_task_n}@{n}' running. Time spent: @{Cyellow}$[prgetstime(nun_task_t)]@{n} (@{Cred}%{nun_task_c}@{n} to complete)%;\
 	/else \
 		/msq @{BCgreen}No task started!@{n}%;\
 	/endif
 
-/def -i -p9999 -aCyellow -mregexp -t"^\* YOU STARTED TASK '([A-Za-z' ]*)', TIME TO COMPLETE: ([a-z0-9]*) \*$" gnun_task_started =\
-	/set gnun_task_n=%{P1}%;/set gnun_task_t=$[time()]%;/set gnun_task_c=%{P2}%;
+/def -i -p9999 -mregexp -t"^\* YOU STARTED TASK '([A-Za-z' ]+)', TIME TO COMPLETE: ([a-z0-9]+) \*$" gnun_task_started =\
+	/set nun_task_n=%{P1}%;/set nun_task_t=$[time()]%;/set nun_task_c=%{P2}
 
-/def -i -p9999 -aCyellow -mregexp -t"^\* CONGRATULATIONS! You have completed nun task '([A-Za-z' ]*)'\*$" gnun_task_completed =\
-	/msq @{BCgreen}Completed nun task:@{n} '@{Ccyan}'%{gnun_task_n}'@{n} Time spent: @{Cyellow}$[prgetstime(gnun_task_t)]@{n}%;\
-	/set gnun_task_n=""%;/set gnun_task_t=0%;/set gnun_task_c=0%;
+/def -i -p9999 -mregexp -t"^\* CONGRATULATIONS! You have completed nun task '([A-Za-z' ]+)'\*$" gnun_task_completed =\
+	/msq @{BCgreen}Completed nun task@{n} '@{Ccyan}%{nun_task_n}@{n}'. Time spent: @{Cyellow}$[prgetstime(nun_task_t)]@{n}%;\
+	/set nun_task_n=%;/set nun_task_t=0%;/set nun_task_c=0
 
-/def -mregexp -t"^\* You have FAILED task '([A-Za-z' ]*)' \*" gnun_task_failed =\
-	/msq @{BCgreen}Failed nun task:@{n} @{Ccyan}'%{gnun_task_n}'@{n} Time spent: @{Cyellow}$[prgetstime(gnun_task_t)]@{n}%;\
-	/set gnun_task_n=""%;/set gnun_task_t=0%;/set gnun_task_c=0%;
+/def -i -p9999 -mregexp -t"^\* You have FAILED task '([A-Za-z' ]+)' \*" gnun_task_failed =\
+	/msq @{BCgreen}Failed nun task@{n} '@{Ccyan}%{nun_task_n}@{n}'. Time spent: @{Cyellow}$[prgetstime(nun_task_t)]@{n}%;\
+	/set nun_task_n=%;/set nun_task_t=0%;/set nun_task_c=0