Fixes to assignment 2

closes #115, closes #111, closes #89