Fixed some names. Added some comments.