a
cleaned up some code
Merge branch 'final' of https://github.com/Boddhi/Ascent into final