Code cleanup
#321 restored command line ability