some minor fixes
Merge branch 'master' of github.com:mrwhite92/hw1 into fix