Filling in CHANGELOG and rearranging some of the sections for consistency