Added loading screen, various other minor fixes