Bugfixes.
Merge branch 'master' of github.com:TheLastBanana/291-proj2