Small bug fixes and comments.