Issue #181 cleanup and better command handling
merge master
rebuild for prod