Update Changelog, small cleanups