Edits/fixes to Deliverable 3