Adjust command ranks and minor style fixes