Performance enhancements II, cleanup

Cleans up code and improves performance by elevating all Executables to
java.lang.Runnable status.

Also finally properly fixes up the issue in the terminal.