Doorway adjacencies fixed.  A few more tests work.