many small fixes --  all tests passing again