Updates in response to feedback on Assign 1 and 2