minor bug fixes
Merge branch 'master' of ssh://git@github.com/jessicayuen/CMPUT301T13.git