Change back the CommandExecuter
Fix player: and npc: argument issues when using tags. Fix player: and npc: from resolving prematurely in an if statement.
Fixes to Flag Command...
Fix premature prefix stripping.
Remove some debug messages.
Fix merge.