Updates to CLI, angular app, cleanup.