Minor improvements here and there
Merge branch 'master' of github.com:Sygnious/AutumnProject2014