Misc updates to assignment.cpp