Fixes to assignment 2

closes #115, closes #111, closes #89
Merge pull request #122 from depstein/a2

Fixes to assignment 2