Corrections and fixes to assignment 1