catching up with recent changes

I'll leave this open until after the release. No further changes anticipated, but one never knows!