Adds Main.stop() and cleans up a few log-strings.
Merge pull request #352 from Nycander/main-stop

Adds Main.stop() and cleans up a few log-strings.