fixes to assignment 2