Clarifications and comment cleanup.