Fixed penis issues. Penis.
Updated formatting, removed some TODOs.
Merge branch 'master' of https://github.com/aceofwings/ProjectMaze