Various improvements to commands and a few new commands