Fixed up and added another command to the CLI