Updated some comments, cleaned some stuff up from a review