Fixed some of the assignment code