Name fixes. Added some comments.