some more bug fixes
Merge branch 'master' of https://github.com/MetropoliaPortal/Engine