Cli tweaks

Couple very minor tweaks - make 'exit' exit the CLI and simplify the REPL loop.