more fixes; 2 tests pass now