Lots of small fixes.
Merge branch 'master' of https://github.com/nplaster/csci443