Merge branch 'develop' into code-cleanup
Commented everything, fixed some bugs, culled code
Merge branch 'code-cleanup' into develop