Better Changelog and minor fixes