Updated some class names, and added a couple of comment.