Comments fix and whitespace