Improvements to the CLI, bugfix with gcp