Fixes and can now start/stop via REPL.