Updating Changelog
More template fixes.