After review, fixes from assignment 1