Many changes to Cistern_Cave, added warps too.