general improvements to commands