more fixes. test-maru goes further, but not yet...