redo cleanup and say goodbye after exit
Merge branch 'cmds'
crazy merge with lots of collisions