1-fix-assignment-errors

Please fix known bugs in assignment code.