Fixed some changelog entries
Minor comment improvements
Fiddled with some macros