Added feature highlights to CHANGELOG and minor cleanups in code