A few fixes and updated some comments.