Added control commands, tweaked some commands.
Merge branch 'feature/eclipse_updates'