Corrected some comments that were mixed up, due to refactoring.