diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c
index 7e0d5e3a..6d5d0a05 100644
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -51,21 +51,22 @@ struct cmndstr player_coms[] = {
     {"army <ARMY> <UNITS>", 0, army, C_MOD, NORM},
     {"assault <to-SECT> <from-SHIP> [<forts?> <ships?> <arty?> <planes?>]",
      3, assa, C_MOD, NORM + MONEY + CAP},
-    {"attack <SECT> [<forts?> <ships?> <arty?> <planes?>]", 3, atta, C_MOD,
-     NORM + MONEY + CAP},
+    {"attack <SECT> [<forts?> <ships?> <arty?> <planes?>]",
+     3, atta, C_MOD, NORM + MONEY + CAP},
     {"bdes <SECTS> <type>", 0, bdes, C_MOD, NORM},
     {"bestpath <SECTS> <SECTS>", 0, best, 0, NORM},
     {"bmap <SECTS|UNIT> [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM},
-    {"board <to-SHIP> [<from-SHIP>|<from-sector>]", 3, boar, C_MOD,
-     NORM + MONEY + CAP},
-    {"bomb <bomber-PLANES> <fighter-PLANES> <pin|strat> <ap-SECT> <PATH|DESTINATION>", 2, bomb, C_MOD, NORM + MONEY + CAP},
+    {"board <to-SHIP> [<from-SHIP>|<from-sector>]",
+     3, boar, C_MOD, NORM + MONEY + CAP},
+    {"bomb <bomber-PLANES> <fighter-PLANES> <pin|strat> <ap-SECT> <PATH|DESTINATION>",
+     2, bomb, C_MOD, NORM + MONEY + CAP},
     {"break {sanctuary}", 1, brea, C_MOD, SANCT},
-    {"budget [<sector type|P|S|L|A|M|N|C> <PRIORITY|~>]", 1, budg, 0,
-     NORM},
-    {"build <s|l|b|p|n|t> <SECTS> <type|dir> [<number> <tech> <sure?>]", 1,
-     buil, C_MOD, NORM + MONEY + CAP},
-    {"buy <COMM> <LOT#> <BID/UNIT> <DEST>", 1, buy, C_MOD,
-     CAP + NORM + MONEY},
+    {"budget [<sector type|P|S|L|A|M|N|C> <PRIORITY|~>]",
+     1, budg, 0, NORM},
+    {"build <s|l|b|p|n|t> <SECTS> <type|dir> [<number> <tech> <sure?>]",
+     1, buil, C_MOD, NORM + MONEY + CAP},
+    {"buy <COMM> <LOT#> <BID/UNIT> <DEST>",
+     1, buy, C_MOD, CAP + NORM + MONEY},
     {"bye {log-off}", 0, quit, 0, VIS},
     {"capital <SECT>", 0, capi, C_MOD, NORM},
     {"cargo <SHIPS>", 0, carg, 0, NORM},
@@ -77,86 +78,90 @@ struct cmndstr player_coms[] = {
     {"coastwatch <SECTS>", 1, coas, C_MOD, NORM + CAP},
     {"collect <LOAN> <SECT>", 2, coll, C_MOD, NORM + MONEY + CAP},
     {"commodity <SECTS>", 0, comm, 0, VIS},
-    {"consider <loan|treaty> <LOAN/TREATY> <acc|decl|post>", 1, cons,
-     C_MOD, NORM + CAP},
+    {"consider <loan|treaty> <LOAN/TREATY> <acc|decl|post>",
+     1, cons, C_MOD, NORM + CAP},
     {"convert <SECTS> <NUM> [sure?]", 2, conv, C_MOD, NORM + MONEY + CAP},
     {"country <NATS>", 0, coun, 0, NORM},
     {"cutoff <SECTS>", 0, cuto, C_MOD, NORM},
-    {"declare <all|friend|neut|hos|war> <NATS>", 2, decl, C_MOD,
-     NORM + CAP},
+    {"declare <all|friend|neut|hos|war> <NATS>",
+     2, decl, C_MOD, NORM + CAP},
     {"deliver <COMM> <SECTS> [q|<THRESH>] [<DIR>]", 1, deli, C_MOD, NORM},
-    {"demobilize <SECTS> <NUM> <active-reserve?> [sure?]", 1, demo, C_MOD,
-     NORM + CAP},
+    {"demobilize <SECTS> <NUM> <active-reserve?> [sure?]",
+     1, demo, C_MOD, NORM + CAP},
     {"designate <SECTS> <type> [sure?]", 1, desi, C_MOD, NORM},
     {"disable", 0, disa, C_MOD, GOD},
     {"disarm <PLANE>", 2, disarm, C_MOD, NORM + MONEY + CAP},
     {"distribute <SECTS> <DISTSECT|.|h>", 1, dist, C_MOD, NORM},
-    {"drop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COMM>", 1, drop, C_MOD, NORM + MONEY + CAP},
+    {"drop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COMM>",
+     1, drop, C_MOD, NORM + MONEY + CAP},
     {"dump <SECTS> [<fields>]", 0, dump, 0, NORM},
     {"echo [<string>]", 0, echo, 0, NORM},
-    {"edit <country|land|unit|ship|plane|nuke> [<KEY> <VALUE>]...", 0,
-     edit, C_MOD, GOD},
+    {"edit <country|land|unit|ship|plane|nuke> [<KEY> <VALUE>]...",
+     0, edit, C_MOD, GOD},
     {"enable", 0, enab, C_MOD, GOD},
     {"enlist <SECTS> <NUM>", 2, enli, C_MOD, NORM + MONEY + CAP},
     {"execute <INPUT FILE>", 0, execute, 0, VIS},
-    {"explore <c|m> <SECT> <NUM> <PATH|DESTINATION>", 1, explore, C_MOD,
-     NORM + MONEY + CAP},
+    {"explore <c|m> <SECT> <NUM> <PATH|DESTINATION>",
+     1, explore, C_MOD, NORM + MONEY + CAP},
     {"financial", 0, fina, 0, NORM},
-    {"fire <TYPE> <from-SECTS | SHIPS | UNITS> [TO-SECT | SHIP]", 1, multifire, C_MOD, NORM + MONEY + CAP},
+    {"fire <TYPE> <from-SECTS | SHIPS | UNITS> [TO-SECT | SHIP]",
+     1, multifire, C_MOD, NORM + MONEY + CAP},
     {"flash <COUNTRY> [<message>]", 0, flash, 0, VIS},
     {"fleetadd <FLEET> <SHIPS>", 0, flee, C_MOD, NORM},
-    {"fly <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COM>", 2, fly, C_MOD, NORM + MONEY + CAP},
+    {"fly <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION> <COM>",
+     2, fly, C_MOD, NORM + MONEY + CAP},
     {"follow <leader> <SHIPS>", 1, foll, C_MOD, NORM + CAP},
     {"force <delay time>", 0, force, C_MOD, GOD},
     {"fortify <UNITS> <MOB>", 1, fort, C_MOD, NORM},
-    {"fuel <s|l> <SHIP/FLEET | UNIT/ARMY> <AMOUNT> [<OILER>]", 1, fuel,
-     C_MOD, NORM},
+    {"fuel <s|l> <SHIP/FLEET | UNIT/ARMY> <AMOUNT> [<OILER>]",
+     1, fuel, C_MOD, NORM},
     {"give <COMM> <SECT> <NUM>", 0, give, C_MOD, GOD},
     {"grind <SECT> <NUM>", 1, grin, C_MOD, NORM + MONEY + CAP},
     {"harden <PLANES> <NUM>", 2, hard, C_MOD, NORM + MONEY + CAP},
     {"headlines [days]", 0, head, C_MOD, VIS},
     {"help <topic>", 0, info, 0, VIS},
-    {"improve <road|rail|defense> <SECTS> <NUM>", 1, improve, C_MOD,
-     NORM + MONEY + CAP},
+    {"improve <road|rail|defense> <SECTS> <NUM>",
+     1, improve, C_MOD, NORM + MONEY + CAP},
     {"info <topic>", 0, info, 0, VIS},
     {"land <UNITS>", 0, land, C_MOD, NORM},
     {"launch <PLANES> <SECT|SHIP>", 3, laun, C_MOD, NORM + MONEY + CAP},
     {"lbmap <SECTS|UNIT> [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM},
-    {"lboard <to-LAND> [<from-sector>]", 3, lboa, C_MOD,
-     NORM + MONEY + CAP},
+    {"lboard <to-LAND> [<from-sector>]",
+     3, lboa, C_MOD, NORM + MONEY + CAP},
     {"lcargo <UNITS>", 0, lcarg, 0, NORM},
     {"ldump <UNITS> [<fields>]", 0, ldump, 0, NORM},
     {"ledger <LOANS>", 0, ledg, 0, NORM},
     {"level <SECTS>", 0, leve, 0, NORM},
     {"list of commands", 0, explain, 0, VIS},
-    {"lload <COMM|\"land\"|\"plane\"> <UNITS> <NUM|UNITS|PLANES>", 1,
-     lload, C_MOD, NORM + CAP},
+    {"lload <COMM|\"land\"|\"plane\"> <UNITS> <NUM|UNITS|PLANES>",
+     1, lload, C_MOD, NORM + CAP},
     {"llookout <UNITS>", 1, llook, 0, NORM + CAP},
     {"lmap <SECTS|UNIT> [s|l|p|*|h]", 0, map, C_MOD, NORM},
     {"lmine <UNITS>", 2, landmine, C_MOD, NORM + MONEY + CAP},
-    {"load <COMM|\"land\"|\"plane\"> <SHIPS> <NUM|UNITS|PLANES>", 1, load,
-     C_MOD, NORM + CAP},
+    {"load <COMM|\"land\"|\"plane\"> <SHIPS> <NUM|UNITS|PLANES>",
+     1, load, C_MOD, NORM + CAP},
     {"lookout <SHIPS>", 1, look, 0, NORM + CAP},
     {"lost", 0, lost, 0, NORM},
     {"lradar <UNITS | SECTS>", 1, rada, 0, NORM + CAP},
     {"lrange <UNITS> <range>", 1, lrange, C_MOD, NORM + CAP},
-    {"lretreat <UNITS|ARMY> <PATH> [i|h|b|c]", 1, lretr, C_MOD,
-     NORM + CAP},
+    {"lretreat <UNITS|ARMY> <PATH> [i|h|b|c]",
+     1, lretr, C_MOD, NORM + CAP},
     {"lstat <UNITS>", 0, lsta, C_MOD, NORM},
-    {"ltend <COMM> <tender-SHIPS> <NUM> <UNITS>", 1, ltend, C_MOD,
-     NORM + CAP},
-    {"lunload <COMM|\"land\"|\"plane\"> <UNITS> <NUM|UNITS|PLANES>", 1,
-     lload, C_MOD, NORM + CAP},
+    {"ltend <COMM> <tender-SHIPS> <NUM> <UNITS>",
+     1, ltend, C_MOD, NORM + CAP},
+    {"lunload <COMM|\"land\"|\"plane\"> <UNITS> <NUM|UNITS|PLANES>",
+     1, lload, C_MOD, NORM + CAP},
     {"map <SECTS|SHIP> [s|l|p|*|h]", 0, map, C_MOD, VIS},
     {"march <UNITS> <PATH|DESTINATION>", 1, march, C_MOD, NORM + CAP},
     {"market <COMM|\"all\">", 0, mark, 0, VIS},
     {"mine <SHIPS>", 2, mine, C_MOD, NORM + MONEY + CAP},
-    {"mission <type> <PLANES|SHIPS|UNITS> <mission type> <op sect> [<radius>]", 2, mission, C_MOD, NORM + CAP},
+    {"mission <TYPE> <PLANES|SHIPS|UNITS> <mission type> <op sect> [<radius>]",
+     2, mission, C_MOD, NORM + CAP},
     {"mobupdate <MINUTES|check>", 0, mobupdate, C_MOD, GOD},
     {"morale <UNITS> <retreat%>", 1, morale, C_MOD, NORM + CAP},
     {"motd", 0, show_motd, C_MOD, VIS},
-    {"move <COMM> <SECT> <NUM> <PATH|DESTINATION>", 1,
-     move, C_MOD, NORM + CAP},
+    {"move <COMM> <SECT> <NUM> <PATH|DESTINATION>",
+     1, move, C_MOD, NORM + CAP},
     {"mquota <SHIPS> <value>", 2, mobq, C_MOD, NORM + CAP},
     {"name <SHIPS> <NAME>", 0, name, C_MOD, NORM},
     {"nation [as-COUNTRY]", 0, nati, 0, VIS},
@@ -167,11 +172,12 @@ struct cmndstr player_coms[] = {
     {"newspaper [days]", 0, news, 0, VIS},
     {"nmap <SECTS|SHIP> [s|l|p|*|h]", 0, map, C_MOD, VIS},
     {"nuke <SECTS>", 0, nuke, 0, NORM},
-    {"offer <loan|treaty> <NAT> [<NUM> <DAYS> <IRATE>]", 1, offe, C_MOD,
-     NORM + MONEY + CAP},
+    {"offer <loan|treaty> <NAT> [<NUM> <DAYS> <IRATE>]",
+     1, offe, C_MOD, NORM + MONEY + CAP},
     {"order <SHIPS> <c|s|r|d|l> ", 1, orde, C_MOD, NORM + CAP},
     {"origin <SECT|COUNTRY|~>", 1, orig, C_MOD, NORM},
-    {"paradrop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>", 3, para, C_MOD, NORM + MONEY + CAP},
+    {"paradrop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>",
+     3, para, C_MOD, NORM + MONEY + CAP},
     {"path <SECT>", 0, path, 0, NORM},
     {"payoff <SHIPS>", 0, payo, C_MOD, NORM},
     {"pbmap <SECTS|UNIT> [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM},
@@ -181,7 +187,8 @@ struct cmndstr player_coms[] = {
     {"plane <SECTS>", 0, plan, 0, NORM},
     {"players", 0, play, 0, VIS},
     {"pmap <SECTS|UNIT> [s|l|p|*|h]", 0, map, C_MOD, NORM},
-    {"power [[\"new\" [<NUMBER OF COUNTRIES>]] | [\"country\" <COUNTRY NUMBER>]]", 0, powe, C_MOD, VIS},
+    {"power [[\"new\" [<NUMBER OF COUNTRIES>]] | [\"country\" <NATS>]]",
+     0, powe, C_MOD, VIS},
     {"pray", 0, tele, C_MOD, NORM},
     {"production <SECTS>", 0, prod, 0, NORM},
     {"pstat <PLANES>", 0, pstat, 0, NORM},
@@ -191,38 +198,38 @@ struct cmndstr player_coms[] = {
     {"range <PLANES> <range>", 1, range, C_MOD, NORM + CAP},
     {"read [yes|no|<CNUM/CNAME>]", 0, rea, C_MOD, VIS},
     {"realm <number> [<SECTS>]", 0, real, C_MOD, NORM},
-    {"recon <spy-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>", 3,
-     reco, C_MOD, NORM + MONEY + CAP},
-    {"reject <reject|accept> <announcements|mail|treaties|loans> <NAT>", 2,
-     reje, C_MOD, NORM},
+    {"recon <spy-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>",
+     3, reco, C_MOD, NORM + MONEY + CAP},
+    {"reject <reject|accept> <announcements|mail|treaties|loans> <NAT>",
+     2, reje, C_MOD, NORM},
     {"relations  [as-COUNTRY]", 0, rela, 0, VIS},
     {"repay <LOAN> <NUM>", 1, repa, C_MOD, NORM + MONEY + CAP},
     {"report <NATS>", 0, repo, 0, VIS},
     {"reset <lot #> <0|price>", 1, rese, C_MOD, NORM + CAP},
     {"resource <SECTS>", 0, reso, 0, NORM},
-    {"retreat <SHIPS|FLEET> <PATH> [i|t|s|h|b|d|u|c]", 1, retr, C_MOD,
-     NORM + CAP},
+    {"retreat <SHIPS|FLEET> <PATH> [i|t|s|h|b|d|u|c]",
+     1, retr, C_MOD, NORM + CAP},
     {"route <COMM> <SECTS>", 1, rout, 0, NORM},
     {"sabotage <UNITS>", 1, sabo, C_MOD, NORM + MONEY + CAP},
     {"sail <SHIPS> <PATH>", 1, sail, C_MOD, NORM + CAP},
-    {"satellite <PLANE> [<se|sh|l> [?cond&cond&...]]", 1, sate, 0,
-     NORM + MONEY + CAP},
+    {"satellite <PLANE> [<se|sh|l> [?cond&cond&...]]",
+     1, sate, 0, NORM + MONEY + CAP},
     {"sbmap <SECTS|UNIT> [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM},
-    {"scrap <s|p|l> <SHIPS|PLANES|UNITS>", 2, scra, C_MOD,
-     NORM + MONEY + CAP},
+    {"scrap <s|p|l> <SHIPS|PLANES|UNITS>",
+     2, scra, C_MOD, NORM + MONEY + CAP},
     {"scuttle <s|p|l> <SHIPS|PLANES|UNITS>", 5, scut, C_MOD, NORM + CAP},
     {"sdump <SHIPS> [<fields>]", 0, sdump, 0, NORM},
     {"sect <SECTS>", 0, sct, 0, NORM},
     {"sell <COMM> <SECTS> <NUM> <NUM>", 1, sell, C_MOD, NORM + CAP},
     {"set <TYPE> <LIST> <PRICE>", 1, set, C_MOD, NORM + CAP},
-    {"setresource <TYPE> <SECTS> <NUM>", 0, setres, C_MOD, GOD},
-    {"setsector <TYPE> <SECTS> <NUM>", 0, setsector, C_MOD, GOD},
+    {"setresource <type> <SECTS> <NUM>", 0, setres, C_MOD, GOD},
+    {"setsector <type> <SECTS> <NUM>", 0, setsector, C_MOD, GOD},
     {"sharebmap <CNUM/CNAME> <SECTS> [<des>]", 0, shar, C_MOD, NORM},
     {"shark <LOAN>", 25, shark, C_MOD, NORM + MONEY + CAP},
     {"ship <SHIPS>", 0, shi, 0, NORM},
     {"shoot <c|u> <SECTS> <NUMBER>", 3, shoo, C_MOD, NORM + MONEY + CAP},
-    {"show <TYPE> <\"build\"|\"stats\"|\"cap\"> [<tech>]", 0, show, 0,
-     VIS},
+    {"show <TYPE|\"bridge\"|\"tower\"> <\"build\"|\"stats\"|\"cap\"> [<tech>]",
+     0, show, 0, VIS},
     {"shutdown [<minutes>] <disable update?>", 0, shut, 0, GOD},
     {"sinfrastructure <SECTS>", 0, sinfra, 0, VIS},
     {"skywatch <SECTS>", 1, skyw, C_MOD, NORM + CAP},
@@ -241,27 +248,27 @@ struct cmndstr player_coms[] = {
     {"sweep <sweep-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>",
      3, reco, C_MOD, NORM + MONEY + CAP},
     {"telegram <NATS>...", 0, tele, C_MOD, NORM},
-    {"tend <COMM|\"land\"> <tender-SHIPS> <NUM|UNIT> <dest-SHIPS>", 1,
-     tend, C_MOD, NORM + CAP},
+    {"tend <COMM|\"land\"> <tender-SHIPS> <NUM|UNIT> <dest-SHIPS>",
+     1, tend, C_MOD, NORM + CAP},
     {"territory <SECTS> <NUMBER> [<FIELD>]", 0, terr, C_MOD, NORM},
-    {"test <COMM> <SECT> <NUM> <PATH|DESTINATION>", 1,
-     move, C_MOD, NORM + CAP},
+    {"test <COMM> <SECT> <NUM> <PATH|DESTINATION>",
+     1, move, C_MOD, NORM + CAP},
     {"threshold <COMM> <SECTS> <THRESH>", 1, thre, C_MOD, NORM},
-    {"toggle [inform|flash|beep|coastwatch|sonar|techlists] [on|off]", 0,
-     togg, C_MOD, VIS},
-    {"torpedo <submarine-SHIPS> <target-SHIP>", 3, torp, C_MOD,
-     NORM + MONEY + CAP},
+    {"toggle [inform|flash|beep|coastwatch|sonar|techlists] [on|off]",
+     0, togg, C_MOD, VIS},
+    {"torpedo <submarine-SHIPS> <target-SHIP>",
+     3, torp, C_MOD, NORM + MONEY + CAP},
     {"trade", 1, trad, C_MOD, NORM + CAP + MONEY},
     {"transport <\"nuke\"|\"plane\"> <NUKES|PLANES> <PATH|DESTINATION>",
      1, tran, C_MOD, NORM + CAP},
     {"treaty <TREATIES>", 0, trea, 0, NORM + MONEY + CAP},
     {"turn <\"on\"|\"off\"|\"mess\">", 0, turn, C_MOD, GOD},
-    {"unload <COMM|\"land\"|\"plane\"> <SHIPS> <NUM|UNIT|PLANE>", 1, load,
-     C_MOD, NORM + CAP},
+    {"unload <COMM|\"land\"|\"plane\"> <SHIPS> <NUM|UNIT|PLANE>",
+     1, load, C_MOD, NORM + CAP},
     {"unsail <SHIPS>", 1, sail, C_MOD, NORM + CAP},
     {"update", 0, upda, 0, VIS},
-    {"upgrade <s|p|l> <SHIPS|PLANES|UNITS>", 1, upgr, C_MOD,
-     NORM + MONEY + CAP},
+    {"upgrade <s|p|l> <SHIPS|PLANES|UNITS>",
+     1, upgr, C_MOD, NORM + MONEY + CAP},
     {"version", 0, vers, 0, VIS},
     {"wait", 0, wai, C_MOD, GOD},
     {"wall [<message>]", 0, wall, C_MOD, NORM},