Minor Message -> JSON cleanup
Added ExitMessage