Bug fixes (?)

Probably? Also formatting
Merge branch 'master' of https://github.com/quinston/summative2013