Fix game not shutting down
Deobfuscate, fix some merge issues.