Final update before handing in, update some of the comments