Updated some of the comments, and removed some OLD lines