some fixes
adding things that were missed in commit
Merge pull request #8 from joshshadik/hw7

Hw7