Minor refactoring
A few optimizations of CmdBox
Optimizations here and there
Add a bunch of TODOs