Bug fix in changing wmes for commands
small tweaks
Merged in origin/bug-fix
Added higher-than filter
delete swp file