Sorted out some comments.