Sync up last minute fixes

Fixes loading screen flash and removes/cleans up comments.