[20170125173147] CLI Improvements and Rack fixes