A bit of work on #22 and other fixes