adding more commands and some general cleanup and test improvments