Fixed a few of the #57 bugs, the easy ones.
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14