Minor tweaks

Stop world scrolling and shorten loading time