Misc fixes and cleanups
Rewrote the terminal commands some more (see #43)
Removed all standalone force-cmds (closes #43)