Fix various small issues to pass test cases
Merge branch 'DRY' of github.com:adrianlee/414-A3 into DRY