Final-round of code tweaks. All commands working well.

Once this is merged, we are good to land your PR.