Cleanup code, update command handling to allow sub sub commands, etc...