Correct and clarify comments