Added some minor improvements.
Merge branch 'develop-2.0' of https://github.com/bananu7/Engine into develop-2.0