Fixed game crash on load, various minor improvements
Merge pull request #76 from Rylius/development

Fixed game crash on load, various minor improvements