fixing up comments, getting ready to finish, some code cleanup.