additional fixes/additions
Merge branch 'master' of https://github.com/Xrave/CS147-Final-Project