work-in-progress misc changes