Minor bug fixes
Merge branch 'master' of https://github.com/scmarlatt/EECS445_FunWithYelp