Small name fixes and comments.