Fixed game crash on load, various minor improvements