Doorway fixes, some other fixes.  NEEDS OVERHAUL