more changelog consolidation and cleanup