More changes to commands, some prettifying and formatting changes in other files as well.