CHANGELOG fix, and some comment cleaning
Fixing typo