general fix + loading screen