fixed a bunch of broken stuff
Merge branch 'master' of https://github.com/the-ben-waters/pistrion