fold in (and fix up) some changes entries so far