More edits to assignment 2