Major bugfixes
Merge branch 'master' of github.com:zmjjmz/pa-proj
Ian did something