diff --git a/common/binds.tf b/common/binds.tf
index cbff06d..fec6ea6 100644
--- a/common/binds.tf
+++ b/common/binds.tf
@@ -2,119 +2,120 @@
 /def key_nkp0 = stan
 
 /def dobind = \
-  %{*} %;\
-  /unset bindings %;\
-  /set bindings= %;\
+  %{*}%;\
+  /unset bindings%;\
+  /set bindings=%;\
   /undef tempbind
 
 /def tbind = \
   /if ( {bindings} =~ {*} ) \
-    /true %;\
+    /true%;\
   /else \
-    /set bindings %{*} %;\
-    /def -b'`' tempbind = /dobind %{*} %;\
+    /set bindings %{*}%;\
+    /def -b'`' tempbind = /dobind %{*}%;\
       /if ( {ktype} =~ "mac" ) \
-       /def key_nkp- = /dobind %{*} %;\
-      /endif %;\
-      /echo -p @{C%c_info}>>>@{n} %;\
-      /beep 1 %;\
+       /def key_nkp- = /dobind %{*}%;\
+      /endif%;\
+      /echo -p @{C%c_info}>>>@{n}%;\
+      /beep 1%;\
   /endif
 
 /def f1 = \
   /if ( {1} =~ "" ) \
-    /echo -p #@{C%c_info}#@{n}# f1  -  @{C%c_info}%{f1} %;\
+    /echo -p #@{C%c_info}#@{n}# f1  -  @{C%c_info}%{f1}%;\
   /elseif ( {1} =~ "empty" ) \
-    /def key_f1 = /echo -p #@{C%c_info}#@{n}# Not set. %;\
-    /set f1 empty %;\
+    /def key_f1 = /echo -p #@{C%c_info}#@{n}# Not set.%;\
+    /set f1 empty%;\
   /else \
-      /def key_f1 = %{*} %;\
-        /set f1 %{*} %;\
+      /def key_f1 = %{*}%;\
+        /set f1 %{*}%;\
   /endif
 
 /def f2 = \
   /if ( {1} =~ "" ) \
-    /echo -p #@{C%c_info}#@{n}# f2  -  @{C%c_info}%{f2} %;\
+    /echo -p #@{C%c_info}#@{n}# f2  -  @{C%c_info}%{f2}%;\
   /elseif ( {1} =~ "empty" ) \
-    /def key_f2 = /echo -p #@{C%c_info}#@{n}# Not set. %;\
-    /set f2 empty %;\
+    /def key_f2 = /echo -p #@{C%c_info}#@{n}# Not set.%;\
+    /set f2 empty%;\
   /else \
-    /def key_f2 = %{*} %;\
-    /set f2 %{*} %;\
+    /def key_f2 = %{*}%;\
+    /set f2 %{*}%;\
   /endif
 
 /def f3 = \
   /if ( {1} =~ "" ) \
-    /echo -p #@{C%c_info}#@{n}# f3  -  @{C%c_info}%{f3} %;\
+    /echo -p #@{C%c_info}#@{n}# f3  -  @{C%c_info}%{f3}%;\
   /elseif ( {1} =~ "empty" ) \
-    /def key_f3 = /echo -p #@{C%c_info}#@{n}# Not set. %;\
-    /set f3 empty %;\
+    /def key_f3 = /echo -p #@{C%c_info}#@{n}# Not set.%;\
+    /set f3 empty%;\
   /else \
-    /def key_f3 = %{*} %;\
-    /set f3 %{*} %;\
+    /def key_f3 = %{*}%;\
+    /set f3 %{*}%;\
   /endif
 
 /def f4 = \
   /if ( {1} =~ "" ) \
-    /echo -p #@{C%c_info}#@{n}# f4  -  @{C%c_info}%{f4} %;\
+    /echo -p #@{C%c_info}#@{n}# f4  -  @{C%c_info}%{f4}%;\
   /elseif ( {1} =~ "empty" ) \
-    /def key_f4 = /echo -p #@{C%c_info}#@{n}# Not hunting anyone. %;\
-    /set f4 empty %;\
+    /def key_f4 = /echo -p #@{C%c_info}#@{n}# Not set.%;\
+    /set f4 empty%;\
   /else \
-    /def key_f4 = %{*} %;\
-    /set f4 %{*} %;\
+    /def key_f4 = %{*}%;\
+    /set f4 %{*}%;\
   /endif
 
 /def f5 = \
   /if ( {1} =~ "" ) \
-    /echo -p #@{C%c_info}#@{n}# f5  -  @{C%c_info}%{f5} %;\
+    /echo -p #@{C%c_info}#@{n}# f5  -  @{C%c_info}%{f5}%;\
   /elseif ( {1} =~ "empty" ) \
-    /def key_f5 = /echo -p #@{C%c_info}#@{n}# Not set. %;\
-    /set f5 empty %;\
+    /def key_f5 = /echo -p #@{C%c_info}#@{n}# Not set.%;\
+    /set f5 empty%;\
   /else \
-    /def key_f5 = %{*} %;\
-    /set f5 %{*} %;\
+    /def key_f5 = %{*}%;\
+    /set f5 %{*}%;\
   /endif
 
 /def f6 = \
   /if ( {1} =~ "" ) \
-    /echo -p #@{C%c_info}#@{n}# f6  -  @{C%c_info}%{f6} %;\
+    /echo -p #@{C%c_info}#@{n}# f6  -  @{C%c_info}%{f6}%;\
   /elseif ( {1} =~ "empty" ) \
-    /def key_f6 = /echo -p #@{C%c_info}#@{n}# Not set. %;\
-    /set f6 empty %;\
+    /def key_f6 = /echo -p #@{C%c_info}#@{n}# Not set.%;\
+    /set f6 empty%;\
   /else \
-    /def key_f6 = %{*} %;\
-    /set f6 %{*} %;\
+    /def key_f6 = %{*}%;\
+    /set f6 %{*}%;\
   /endif
 
 /def f7 = \
   /if ( {1} =~ "" ) \
-    /echo -p #@{C%c_info}#@{n}# f7  -  @{C%c_info}%{f7} %;\
+    /echo -p #@{C%c_info}#@{n}# f7  -  @{C%c_info}%{f7}%;\
   /elseif ( {1} =~ "empty" ) \
-    /def key_f7 = /echo -p #@{C%c_info}#@{n}# Not set. %;\
-    /set f7 empty %;\
+    /def key_f7 = /echo -p #@{C%c_info}#@{n}# Not set.%;\
+    /set f7 empty%;\
   /else \
-    /def key_f7 = %{*} %;\
-    /set f7 %{*} %;\
+    /def key_f7 = %{*}%;\
+    /set f7 %{*}%;\
   /endif
 
 /def f8 = \
   /if ( {1} =~ "" ) \
-    /echo -p #@{C%c_info}#@{n}# f8  -  @{C%c_info}%{f8} %;\
+    /echo -p #@{C%c_info}#@{n}# f8  -  @{C%c_info}%{f8}%;\
   /elseif ( {1} =~ "empty" ) \
-    /def key_f8 = /echo -p #@{C%c_info}#@{n}# Not set. %;\
-    /set f8 empty %;\
+    /def key_f8 = /echo -p #@{C%c_info}#@{n}# Not set.%;\
+    /set f8 empty%;\
   /else \
-    /def key_f8 = %{*} %;\
-    /set f8 %{*} %;\
+    /def key_f8 = %{*}%;\
+    /set f8 %{*}%;\
   /endif
 
 /def bs = \
-  /echo -p #@{C%c_info}#@{n}# ------------ %;\
-  /echo -p #@{C%c_info}#@{n}# f2  -  @{C%c_info}%{f2}@{n} %;\
-  /echo -p #@{C%c_info}#@{n}# f3  -  @{C%c_info}%{f3}@{n} %;\
-  /echo -p #@{C%c_info}#@{n}# f4  -  @{C%c_info}%{f4}@{n} %;\
-  /echo -p #@{C%c_info}#@{n}# ------------ %;\
-  /echo -p #@{C%c_info}#@{n}# f5  -  @{C%c_info}%{f5} %;\
-  /echo -p #@{C%c_info}#@{n}# f6  -  @{C%c_info}%{f6} %;\
-  /echo -p #@{C%c_info}#@{n}# f7  -  @{C%c_info}%{f7} %;\
+  /echo -p #@{C%c_info}#@{n}# ------------%;\
+  /echo -p #@{C%c_info}#@{n}# f1  -  @{C%c_info}%{f1}@{n}%;\
+  /echo -p #@{C%c_info}#@{n}# f2  -  @{C%c_info}%{f2}@{n}%;\
+  /echo -p #@{C%c_info}#@{n}# f3  -  @{C%c_info}%{f3}@{n}%;\
+  /echo -p #@{C%c_info}#@{n}# f4  -  @{C%c_info}%{f4}@{n}%;\
+  /echo -p #@{C%c_info}#@{n}# ------------%;\
+  /echo -p #@{C%c_info}#@{n}# f5  -  @{C%c_info}%{f5}%;\
+  /echo -p #@{C%c_info}#@{n}# f6  -  @{C%c_info}%{f6}%;\
+  /echo -p #@{C%c_info}#@{n}# f7  -  @{C%c_info}%{f7}%;\
   /echo -p #@{C%c_info}#@{n}# f8  -  @{C%c_info}%{f8}
diff --git a/common/hunt.tf b/common/hunt.tf
index a6fcb96..eb57ace 100644
--- a/common/hunt.tf
+++ b/common/hunt.tf
@@ -16,130 +16,115 @@
   /rund  %{*} %;\
   /runx  %{*}
 
-/def dobind_war = \
-  %{*} %;\
-  /f4 empty
-
 /def runne = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na polnocny-wschod." runne2 = \
   /echo %%;\
   /test echo(decode_attr("        # # #  "), {zc_alarm}) %%;\
-  /test echo(decode_attr("          # #  %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("          # #  %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("        #   #  "), {zc_alarm}) %%;\
   /test echo(decode_attr("      #        "), {zc_alarm}) %%;\
   /test echo(decode_attr("    #          "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war ne
+  /beep 1
 
 /def runnw = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na polnocny-zachod." runnw2 = \
   /echo %%;\
   /test echo(decode_attr("   # # #       "), {zc_alarm}) %%;\
-  /test echo(decode_attr("   # #        %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("   # #        %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("   #   #       "), {zc_alarm}) %%;\
   /test echo(decode_attr("         #     "), {zc_alarm}) %%;\
   /test echo(decode_attr("           #   "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war nw
+  /beep 1
 
 /def runse = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na poludniowy-wschod." runse2 = \
   /echo %%;\
   /test echo(decode_attr("   #           "), {zc_alarm}) %%;\
-  /test echo(decode_attr("     #         %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("     #         %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("       #   #   "), {zc_alarm}) %%;\
   /test echo(decode_attr("         # #   "), {zc_alarm}) %%;\
   /test echo(decode_attr("       # # #   "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war se
+  /beep 1
 
 /def runsw = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na poludniowy-zachod." runsw2 = \
   /echo %%;\
   /test echo(decode_attr("           #   "), {zc_alarm}) %%;\
-  /test echo(decode_attr("         #     %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("         #     %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("   #   #       "), {zc_alarm}) %%;\
   /test echo(decode_attr("   # #         "), {zc_alarm}) %%;\
   /test echo(decode_attr("   # # #       "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war sw
+  /beep 1
 
 /def rune = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na wschod." rune2 = \
   /echo %%;\
   /test echo(decode_attr("          #    "), {zc_alarm}) %%;\
-  /test echo(decode_attr("           #   %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("           #   %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("    #########  "), {zc_alarm}) %%;\
   /test echo(decode_attr("           #   "), {zc_alarm}) %%;\
   /test echo(decode_attr("          #    "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war e
+  /beep 1
 
 /def runw = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na zachod." runw2 = \
   /echo %%;\
   /test echo(decode_attr("     #         "), {zc_alarm}) %%;\
-  /test echo(decode_attr("    #          %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("    #          %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("   ##########  "), {zc_alarm}) %%;\
   /test echo(decode_attr("    #          "), {zc_alarm}) %%;\
   /test echo(decode_attr("     #         "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war w
+  /beep 1
 
 /def runn = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na polnoc." runn2 = \
   /echo %%;\
   /test echo(decode_attr("       #       "), {zc_alarm}) %%;\
-  /test echo(decode_attr("      ###      %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("      ###      %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("     # # #     "), {zc_alarm}) %%;\
   /test echo(decode_attr("       #       "), {zc_alarm}) %%;\
   /test echo(decode_attr("       #       "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war n
+  /beep 1
 
 /def runs = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na poludnie." runs2 = \
   /echo %%;\
   /test echo(decode_attr("       #       "), {zc_alarm}) %%;\
-  /test echo(decode_attr("       #       %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("       #       %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("     # # #     "), {zc_alarm}) %%;\
   /test echo(decode_attr("      ###      "), {zc_alarm}) %%;\
   /test echo(decode_attr("       #       "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war s
+  /beep 1
 
 /def runu = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na gore." runu2 = \
   /echo %%;\
   /test echo(decode_attr("     #    #    "), {zc_alarm}) %%;\
-  /test echo(decode_attr("     #    #    %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("     #    #    %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("     #    #    "), {zc_alarm}) %%;\
   /test echo(decode_attr("     #    #    "), {zc_alarm}) %%;\
   /test echo(decode_attr("      ####     "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war u
+  /beep 1
 
 /def rund = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * na dol." rund2 = \
   /echo %%;\
   /test echo(decode_attr("     #####     "), {zc_alarm}) %%;\
   /test echo(decode_attr("     #    #    "), {zc_alarm}) %%;\
-  /test echo(decode_attr("     #     #   %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("     #     #   %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("     #     #   "), {zc_alarm}) %%;\
   /test echo(decode_attr("     #    #    "), {zc_alarm}) %%;\
   /test echo(decode_attr("     #####     "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war d
+  /beep 1
 
 /def runx = /def -mglob -aC%c_alarm -Fp2 -t"*%{kto_uciekl} * do wyjscia." runx2 = \
   /echo %%;\
   /test echo(decode_attr("    #   #      "), {zc_alarm}) %%;\
-  /test echo(decode_attr("     # #       %{kto_uciekl} F4"), {zc_alarm}) %%;\
+  /test echo(decode_attr("     # #       %{kto_uciekl}"), {zc_alarm}) %%;\
   /test echo(decode_attr("      #        "), {zc_alarm}) %%;\
   /test echo(decode_attr("     # #       "), {zc_alarm}) %%;\
   /test echo(decode_attr("    #   #      "), {zc_alarm}) %%;\
   /echo %%;\
-  /beep 1 %%;\
-  /f4 /dobind_war wyjscie
+  /beep 1
 
-/def nohunt = /purge -i run*2%; /def key_f4 = /echo -p #@{C%c_info}#@{n}# Not hunting anyone. %; /set f4 empty
+/def nohunt = /purge -i run*2