Sixth Commit

Fixes (Still messed up but better.)
Merge branch 'master' of https://github.com/Macrophage001/Engine