Final lab2 edits

Final comments/code cleanup for lab 2 before handing in.