Added --force flag; many improvements to the CLI