fix commands and cleanup the help messages