cleaned up and a few other cmds