diff --git a/BaseClasses.py b/BaseClasses.py
index 38598d42d999..39f822668c45 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -823,8 +823,8 @@ def __repr__(self):
         return self.__str__()
 
     def __str__(self):
-        world = self.parent_region.multiworld if self.parent_region else None
-        return world.get_name_string_for_object(self) if world else f'{self.name} (Player {self.player})'
+        multiworld = self.parent_region.multiworld if self.parent_region else None
+        return multiworld.get_name_string_for_object(self) if multiworld else f'{self.name} (Player {self.player})'
 
 
 class Region:
@@ -1040,8 +1040,8 @@ def __repr__(self):
         return self.__str__()
 
     def __str__(self):
-        world = self.parent_region.multiworld if self.parent_region and self.parent_region.multiworld else None
-        return world.get_name_string_for_object(self) if world else f'{self.name} (Player {self.player})'
+        multiworld = self.parent_region.multiworld if self.parent_region and self.parent_region.multiworld else None
+        return multiworld.get_name_string_for_object(self) if multiworld else f'{self.name} (Player {self.player})'
 
     def __hash__(self):
         return hash((self.name, self.player))
@@ -1175,7 +1175,7 @@ def set_entrance(self, entrance: str, exit_: str, direction: str, player: int) -
                 {"player": player, "entrance": entrance, "exit": exit_, "direction": direction}
 
     def create_playthrough(self, create_paths: bool = True) -> None:
-        """Destructive to the world while it is run, damage gets repaired afterwards."""
+        """Destructive to the multiworld while it is run, damage gets repaired afterwards."""
         from itertools import chain
         # get locations containing progress items
         multiworld = self.multiworld
diff --git a/Fill.py b/Fill.py
index 525d27d3388e..97ce4cbdb57c 100644
--- a/Fill.py
+++ b/Fill.py
@@ -27,12 +27,12 @@ def sweep_from_pool(base_state: CollectionState, itempool: typing.Sequence[Item]
     return new_state
 
 
-def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations: typing.List[Location],
+def fill_restrictive(multiworld: MultiWorld, base_state: CollectionState, locations: typing.List[Location],
                      item_pool: typing.List[Item], single_player_placement: bool = False, lock: bool = False,
                      swap: bool = True, on_place: typing.Optional[typing.Callable[[Location], None]] = None,
                      allow_partial: bool = False, allow_excluded: bool = False, name: str = "Unknown") -> None:
     """
-    :param world: Multiworld to be filled.
+    :param multiworld: Multiworld to be filled.
     :param base_state: State assumed before fill.
     :param locations: Locations to be filled with item_pool
     :param item_pool: Items to fill into the locations
@@ -68,7 +68,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
         maximum_exploration_state = sweep_from_pool(
             base_state, item_pool + unplaced_items)
 
-        has_beaten_game = world.has_beaten_game(maximum_exploration_state)
+        has_beaten_game = multiworld.has_beaten_game(maximum_exploration_state)
 
         while items_to_place:
             # if we have run out of locations to fill,break out of this loop
@@ -80,8 +80,8 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
             spot_to_fill: typing.Optional[Location] = None
 
             # if minimal accessibility, only check whether location is reachable if game not beatable
-            if world.worlds[item_to_place.player].options.accessibility == Accessibility.option_minimal:
-                perform_access_check = not world.has_beaten_game(maximum_exploration_state,
+            if multiworld.worlds[item_to_place.player].options.accessibility == Accessibility.option_minimal:
+                perform_access_check = not multiworld.has_beaten_game(maximum_exploration_state,
                                                                  item_to_place.player) \
                     if single_player_placement else not has_beaten_game
             else:
@@ -122,11 +122,11 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
                             # Verify placing this item won't reduce available locations, which would be a useless swap.
                             prev_state = swap_state.copy()
                             prev_loc_count = len(
-                                world.get_reachable_locations(prev_state))
+                                multiworld.get_reachable_locations(prev_state))
 
                             swap_state.collect(item_to_place, True)
                             new_loc_count = len(
-                                world.get_reachable_locations(swap_state))
+                                multiworld.get_reachable_locations(swap_state))
 
                             if new_loc_count >= prev_loc_count:
                                 # Add this item to the existing placement, and
@@ -156,7 +156,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
                 else:
                     unplaced_items.append(item_to_place)
                     continue
-            world.push_item(spot_to_fill, item_to_place, False)
+            multiworld.push_item(spot_to_fill, item_to_place, False)
             spot_to_fill.locked = lock
             placements.append(spot_to_fill)
             spot_to_fill.event = item_to_place.advancement
@@ -173,7 +173,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
         # validate all placements and remove invalid ones
         state = sweep_from_pool(base_state, [])
         for placement in placements:
-            if world.accessibility[placement.item.player] != "minimal" and not placement.can_reach(state):
+            if multiworld.accessibility[placement.item.player] != "minimal" and not placement.can_reach(state):
                 placement.item.location = None
                 unplaced_items.append(placement.item)
                 placement.item = None
@@ -188,7 +188,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
         if excluded_locations:
             for location in excluded_locations:
                 location.progress_type = location.progress_type.DEFAULT
-            fill_restrictive(world, base_state, excluded_locations, unplaced_items, single_player_placement, lock,
+            fill_restrictive(multiworld, base_state, excluded_locations, unplaced_items, single_player_placement, lock,
                              swap, on_place, allow_partial, False)
             for location in excluded_locations:
                 if not location.item:
@@ -196,7 +196,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
 
     if not allow_partial and len(unplaced_items) > 0 and len(locations) > 0:
         # There are leftover unplaceable items and locations that won't accept them
-        if world.can_beat_game():
+        if multiworld.can_beat_game():
             logging.warning(
                 f'Not all items placed. Game beatable anyway. (Could not place {unplaced_items})')
         else:
@@ -206,7 +206,7 @@ def fill_restrictive(world: MultiWorld, base_state: CollectionState, locations:
     item_pool.extend(unplaced_items)
 
 
-def remaining_fill(world: MultiWorld,
+def remaining_fill(multiworld: MultiWorld,
                    locations: typing.List[Location],
                    itempool: typing.List[Item]) -> None:
     unplaced_items: typing.List[Item] = []
@@ -261,7 +261,7 @@ def remaining_fill(world: MultiWorld,
                 unplaced_items.append(item_to_place)
                 continue
 
-        world.push_item(spot_to_fill, item_to_place, False)
+        multiworld.push_item(spot_to_fill, item_to_place, False)
         placements.append(spot_to_fill)
         placed += 1
         if not placed % 1000:
@@ -278,19 +278,19 @@ def remaining_fill(world: MultiWorld,
     itempool.extend(unplaced_items)
 
 
-def fast_fill(world: MultiWorld,
+def fast_fill(multiworld: MultiWorld,
               item_pool: typing.List[Item],
               fill_locations: typing.List[Location]) -> typing.Tuple[typing.List[Item], typing.List[Location]]:
     placing = min(len(item_pool), len(fill_locations))
     for item, location in zip(item_pool, fill_locations):
-        world.push_item(location, item, False)
+        multiworld.push_item(location, item, False)
     return item_pool[placing:], fill_locations[placing:]
 
 
-def accessibility_corrections(world: MultiWorld, state: CollectionState, locations, pool=[]):
+def accessibility_corrections(multiworld: MultiWorld, state: CollectionState, locations, pool=[]):
     maximum_exploration_state = sweep_from_pool(state, pool)
-    minimal_players = {player for player in world.player_ids if world.worlds[player].options.accessibility == "minimal"}
-    unreachable_locations = [location for location in world.get_locations() if location.player in minimal_players and
+    minimal_players = {player for player in multiworld.player_ids if multiworld.worlds[player].options.accessibility == "minimal"}
+    unreachable_locations = [location for location in multiworld.get_locations() if location.player in minimal_players and
                              not location.can_reach(maximum_exploration_state)]
     for location in unreachable_locations:
         if (location.item is not None and location.item.advancement and location.address is not None and not
@@ -304,36 +304,36 @@ def accessibility_corrections(world: MultiWorld, state: CollectionState, locatio
             locations.append(location)
     if pool and locations:
         locations.sort(key=lambda loc: loc.progress_type != LocationProgressType.PRIORITY)
-        fill_restrictive(world, state, locations, pool, name="Accessibility Corrections")
+        fill_restrictive(multiworld, state, locations, pool, name="Accessibility Corrections")
 
 
-def inaccessible_location_rules(world: MultiWorld, state: CollectionState, locations):
+def inaccessible_location_rules(multiworld: MultiWorld, state: CollectionState, locations):
     maximum_exploration_state = sweep_from_pool(state)
     unreachable_locations = [location for location in locations if not location.can_reach(maximum_exploration_state)]
     if unreachable_locations:
         def forbid_important_item_rule(item: Item):
-            return not ((item.classification & 0b0011) and world.worlds[item.player].options.accessibility != 'minimal')
+            return not ((item.classification & 0b0011) and multiworld.worlds[item.player].options.accessibility != 'minimal')
 
         for location in unreachable_locations:
             add_item_rule(location, forbid_important_item_rule)
 
 
-def distribute_early_items(world: MultiWorld,
+def distribute_early_items(multiworld: MultiWorld,
                            fill_locations: typing.List[Location],
                            itempool: typing.List[Item]) -> typing.Tuple[typing.List[Location], typing.List[Item]]:
     """ returns new fill_locations and itempool """
     early_items_count: typing.Dict[typing.Tuple[str, int], typing.List[int]] = {}
-    for player in world.player_ids:
-        items = itertools.chain(world.early_items[player], world.local_early_items[player])
+    for player in multiworld.player_ids:
+        items = itertools.chain(multiworld.early_items[player], multiworld.local_early_items[player])
         for item in items:
-            early_items_count[item, player] = [world.early_items[player].get(item, 0),
-                                               world.local_early_items[player].get(item, 0)]
+            early_items_count[item, player] = [multiworld.early_items[player].get(item, 0),
+                                               multiworld.local_early_items[player].get(item, 0)]
     if early_items_count:
         early_locations: typing.List[Location] = []
         early_priority_locations: typing.List[Location] = []
         loc_indexes_to_remove: typing.Set[int] = set()
-        base_state = world.state.copy()
-        base_state.sweep_for_events(locations=(loc for loc in world.get_filled_locations() if loc.address is None))
+        base_state = multiworld.state.copy()
+        base_state.sweep_for_events(locations=(loc for loc in multiworld.get_filled_locations() if loc.address is None))
         for i, loc in enumerate(fill_locations):
             if loc.can_reach(base_state):
                 if loc.progress_type == LocationProgressType.PRIORITY:
@@ -345,8 +345,8 @@ def distribute_early_items(world: MultiWorld,
 
         early_prog_items: typing.List[Item] = []
         early_rest_items: typing.List[Item] = []
-        early_local_prog_items: typing.Dict[int, typing.List[Item]] = {player: [] for player in world.player_ids}
-        early_local_rest_items: typing.Dict[int, typing.List[Item]] = {player: [] for player in world.player_ids}
+        early_local_prog_items: typing.Dict[int, typing.List[Item]] = {player: [] for player in multiworld.player_ids}
+        early_local_rest_items: typing.Dict[int, typing.List[Item]] = {player: [] for player in multiworld.player_ids}
         item_indexes_to_remove: typing.Set[int] = set()
         for i, item in enumerate(itempool):
             if (item.name, item.player) in early_items_count:
@@ -370,28 +370,28 @@ def distribute_early_items(world: MultiWorld,
                     if len(early_items_count) == 0:
                         break
         itempool = [item for i, item in enumerate(itempool) if i not in item_indexes_to_remove]
-        for player in world.player_ids:
+        for player in multiworld.player_ids:
             player_local = early_local_rest_items[player]
-            fill_restrictive(world, base_state,
+            fill_restrictive(multiworld, base_state,
                              [loc for loc in early_locations if loc.player == player],
                              player_local, lock=True, allow_partial=True, name=f"Local Early Items P{player}")
             if player_local:
                 logging.warning(f"Could not fulfill rules of early items: {player_local}")
                 early_rest_items.extend(early_local_rest_items[player])
         early_locations = [loc for loc in early_locations if not loc.item]
-        fill_restrictive(world, base_state, early_locations, early_rest_items, lock=True, allow_partial=True,
+        fill_restrictive(multiworld, base_state, early_locations, early_rest_items, lock=True, allow_partial=True,
                          name="Early Items")
         early_locations += early_priority_locations
-        for player in world.player_ids:
+        for player in multiworld.player_ids:
             player_local = early_local_prog_items[player]
-            fill_restrictive(world, base_state,
+            fill_restrictive(multiworld, base_state,
                              [loc for loc in early_locations if loc.player == player],
                              player_local, lock=True, allow_partial=True, name=f"Local Early Progression P{player}")
             if player_local:
                 logging.warning(f"Could not fulfill rules of early items: {player_local}")
                 early_prog_items.extend(player_local)
         early_locations = [loc for loc in early_locations if not loc.item]
-        fill_restrictive(world, base_state, early_locations, early_prog_items, lock=True, allow_partial=True,
+        fill_restrictive(multiworld, base_state, early_locations, early_prog_items, lock=True, allow_partial=True,
                          name="Early Progression")
         unplaced_early_items = early_rest_items + early_prog_items
         if unplaced_early_items:
@@ -400,18 +400,18 @@ def distribute_early_items(world: MultiWorld,
             itempool += unplaced_early_items
 
         fill_locations.extend(early_locations)
-        world.random.shuffle(fill_locations)
+        multiworld.random.shuffle(fill_locations)
     return fill_locations, itempool
 
 
-def distribute_items_restrictive(world: MultiWorld) -> None:
-    fill_locations = sorted(world.get_unfilled_locations())
-    world.random.shuffle(fill_locations)
+def distribute_items_restrictive(multiworld: MultiWorld) -> None:
+    fill_locations = sorted(multiworld.get_unfilled_locations())
+    multiworld.random.shuffle(fill_locations)
     # get items to distribute
-    itempool = sorted(world.itempool)
-    world.random.shuffle(itempool)
+    itempool = sorted(multiworld.itempool)
+    multiworld.random.shuffle(itempool)
 
-    fill_locations, itempool = distribute_early_items(world, fill_locations, itempool)
+    fill_locations, itempool = distribute_early_items(multiworld, fill_locations, itempool)
 
     progitempool: typing.List[Item] = []
     usefulitempool: typing.List[Item] = []
@@ -425,7 +425,7 @@ def distribute_items_restrictive(world: MultiWorld) -> None:
         else:
             filleritempool.append(item)
 
-    call_all(world, "fill_hook", progitempool, usefulitempool, filleritempool, fill_locations)
+    call_all(multiworld, "fill_hook", progitempool, usefulitempool, filleritempool, fill_locations)
 
     locations: typing.Dict[LocationProgressType, typing.List[Location]] = {
         loc_type: [] for loc_type in LocationProgressType}
@@ -446,34 +446,34 @@ def mark_for_locking(location: Location):
 
     if prioritylocations:
         # "priority fill"
-        fill_restrictive(world, world.state, prioritylocations, progitempool, swap=False, on_place=mark_for_locking,
+        fill_restrictive(multiworld, multiworld.state, prioritylocations, progitempool, swap=False, on_place=mark_for_locking,
                          name="Priority")
-        accessibility_corrections(world, world.state, prioritylocations, progitempool)
+        accessibility_corrections(multiworld, multiworld.state, prioritylocations, progitempool)
         defaultlocations = prioritylocations + defaultlocations
 
     if progitempool:
         # "advancement/progression fill"
-        fill_restrictive(world, world.state, defaultlocations, progitempool, name="Progression")
+        fill_restrictive(multiworld, multiworld.state, defaultlocations, progitempool, name="Progression")
         if progitempool:
             raise FillError(
                 f'Not enough locations for progress items. There are {len(progitempool)} more items than locations')
-        accessibility_corrections(world, world.state, defaultlocations)
+        accessibility_corrections(multiworld, multiworld.state, defaultlocations)
 
     for location in lock_later:
         if location.item:
             location.locked = True
     del mark_for_locking, lock_later
 
-    inaccessible_location_rules(world, world.state, defaultlocations)
+    inaccessible_location_rules(multiworld, multiworld.state, defaultlocations)
 
-    remaining_fill(world, excludedlocations, filleritempool)
+    remaining_fill(multiworld, excludedlocations, filleritempool)
     if excludedlocations:
         raise FillError(
             f"Not enough filler items for excluded locations. There are {len(excludedlocations)} more locations than items")
 
     restitempool = filleritempool + usefulitempool
 
-    remaining_fill(world, defaultlocations, restitempool)
+    remaining_fill(multiworld, defaultlocations, restitempool)
 
     unplaced = restitempool
     unfilled = defaultlocations
@@ -481,40 +481,40 @@ def mark_for_locking(location: Location):
     if unplaced or unfilled:
         logging.warning(
             f'Unplaced items({len(unplaced)}): {unplaced} - Unfilled Locations({len(unfilled)}): {unfilled}')
-        items_counter = Counter(location.item.player for location in world.get_locations() if location.item)
-        locations_counter = Counter(location.player for location in world.get_locations())
+        items_counter = Counter(location.item.player for location in multiworld.get_locations() if location.item)
+        locations_counter = Counter(location.player for location in multiworld.get_locations())
         items_counter.update(item.player for item in unplaced)
         locations_counter.update(location.player for location in unfilled)
         print_data = {"items": items_counter, "locations": locations_counter}
         logging.info(f'Per-Player counts: {print_data})')
 
 
-def flood_items(world: MultiWorld) -> None:
+def flood_items(multiworld: MultiWorld) -> None:
     # get items to distribute
-    world.random.shuffle(world.itempool)
-    itempool = world.itempool
+    multiworld.random.shuffle(multiworld.itempool)
+    itempool = multiworld.itempool
     progress_done = False
 
     # sweep once to pick up preplaced items
-    world.state.sweep_for_events()
+    multiworld.state.sweep_for_events()
 
-    # fill world from top of itempool while we can
+    # fill multiworld from top of itempool while we can
     while not progress_done:
-        location_list = world.get_unfilled_locations()
-        world.random.shuffle(location_list)
+        location_list = multiworld.get_unfilled_locations()
+        multiworld.random.shuffle(location_list)
         spot_to_fill = None
         for location in location_list:
-            if location.can_fill(world.state, itempool[0]):
+            if location.can_fill(multiworld.state, itempool[0]):
                 spot_to_fill = location
                 break
 
         if spot_to_fill:
             item = itempool.pop(0)
-            world.push_item(spot_to_fill, item, True)
+            multiworld.push_item(spot_to_fill, item, True)
             continue
 
         # ran out of spots, check if we need to step in and correct things
-        if len(world.get_reachable_locations()) == len(world.get_locations()):
+        if len(multiworld.get_reachable_locations()) == len(multiworld.get_locations()):
             progress_done = True
             continue
 
@@ -524,7 +524,7 @@ def flood_items(world: MultiWorld) -> None:
         for item in itempool:
             if item.advancement:
                 candidate_item_to_place = item
-                if world.unlocks_new_location(item):
+                if multiworld.unlocks_new_location(item):
                     item_to_place = item
                     break
 
@@ -537,15 +537,15 @@ def flood_items(world: MultiWorld) -> None:
                 raise FillError('No more progress items left to place.')
 
         # find item to replace with progress item
-        location_list = world.get_reachable_locations()
-        world.random.shuffle(location_list)
+        location_list = multiworld.get_reachable_locations()
+        multiworld.random.shuffle(location_list)
         for location in location_list:
             if location.item is not None and not location.item.advancement:
                 # safe to replace
                 replace_item = location.item
                 replace_item.location = None
                 itempool.append(replace_item)
-                world.push_item(location, item_to_place, True)
+                multiworld.push_item(location, item_to_place, True)
                 itempool.remove(item_to_place)
                 break
 
@@ -755,7 +755,7 @@ def swap_location_item(location_1: Location, location_2: Location, check_locked:
     location_1.event, location_2.event = location_2.event, location_1.event
 
 
-def distribute_planned(world: MultiWorld) -> None:
+def distribute_planned(multiworld: MultiWorld) -> None:
     def warn(warning: str, force: typing.Union[bool, str]) -> None:
         if force in [True, 'fail', 'failure', 'none', False, 'warn', 'warning']:
             logging.warning(f'{warning}')
@@ -768,24 +768,24 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
         else:
             warn(warning, force)
 
-    swept_state = world.state.copy()
+    swept_state = multiworld.state.copy()
     swept_state.sweep_for_events()
-    reachable = frozenset(world.get_reachable_locations(swept_state))
+    reachable = frozenset(multiworld.get_reachable_locations(swept_state))
     early_locations: typing.Dict[int, typing.List[str]] = collections.defaultdict(list)
     non_early_locations: typing.Dict[int, typing.List[str]] = collections.defaultdict(list)
-    for loc in world.get_unfilled_locations():
+    for loc in multiworld.get_unfilled_locations():
         if loc in reachable:
             early_locations[loc.player].append(loc.name)
         else:  # not reachable with swept state
             non_early_locations[loc.player].append(loc.name)
 
-    world_name_lookup = world.world_name_lookup
+    world_name_lookup = multiworld.world_name_lookup
 
     block_value = typing.Union[typing.List[str], typing.Dict[str, typing.Any], str]
     plando_blocks: typing.List[typing.Dict[str, typing.Any]] = []
-    player_ids = set(world.player_ids)
+    player_ids = set(multiworld.player_ids)
     for player in player_ids:
-        for block in world.plando_items[player]:
+        for block in multiworld.plando_items[player]:
             block['player'] = player
             if 'force' not in block:
                 block['force'] = 'silent'
@@ -799,12 +799,12 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
             else:
                 target_world = block['world']
 
-            if target_world is False or world.players == 1:  # target own world
+            if target_world is False or multiworld.players == 1:  # target own world
                 worlds: typing.Set[int] = {player}
             elif target_world is True:  # target any worlds besides own
-                worlds = set(world.player_ids) - {player}
+                worlds = set(multiworld.player_ids) - {player}
             elif target_world is None:  # target all worlds
-                worlds = set(world.player_ids)
+                worlds = set(multiworld.player_ids)
             elif type(target_world) == list:  # list of target worlds
                 worlds = set()
                 for listed_world in target_world:
@@ -814,9 +814,9 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
                         continue
                     worlds.add(world_name_lookup[listed_world])
             elif type(target_world) == int:  # target world by slot number
-                if target_world not in range(1, world.players + 1):
+                if target_world not in range(1, multiworld.players + 1):
                     failed(
-                        f"Cannot place item in world {target_world} as it is not in range of (1, {world.players})",
+                        f"Cannot place item in world {target_world} as it is not in range of (1, {multiworld.players})",
                         block['force'])
                     continue
                 worlds = {target_world}
@@ -844,7 +844,7 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
                 item_list: typing.List[str] = []
                 for key, value in items.items():
                     if value is True:
-                        value = world.itempool.count(world.worlds[player].create_item(key))
+                        value = multiworld.itempool.count(multiworld.worlds[player].create_item(key))
                     item_list += [key] * value
                 items = item_list
             if isinstance(items, str):
@@ -894,17 +894,17 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
                 count = block['count']
                 failed(f"Plando count {count} greater than locations specified", block['force'])
                 block['count'] = len(block['locations'])
-            block['count']['target'] = world.random.randint(block['count']['min'], block['count']['max'])
+            block['count']['target'] = multiworld.random.randint(block['count']['min'], block['count']['max'])
 
             if block['count']['target'] > 0:
                 plando_blocks.append(block)
 
     # shuffle, but then sort blocks by number of locations minus number of items,
     # so less-flexible blocks get priority
-    world.random.shuffle(plando_blocks)
+    multiworld.random.shuffle(plando_blocks)
     plando_blocks.sort(key=lambda block: (len(block['locations']) - block['count']['target']
                                           if len(block['locations']) > 0
-                                          else len(world.get_unfilled_locations(player)) - block['count']['target']))
+                                          else len(multiworld.get_unfilled_locations(player)) - block['count']['target']))
 
     for placement in plando_blocks:
         player = placement['player']
@@ -915,19 +915,19 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
             maxcount = placement['count']['target']
             from_pool = placement['from_pool']
 
-            candidates = list(world.get_unfilled_locations_for_players(locations, sorted(worlds)))
-            world.random.shuffle(candidates)
-            world.random.shuffle(items)
+            candidates = list(multiworld.get_unfilled_locations_for_players(locations, sorted(worlds)))
+            multiworld.random.shuffle(candidates)
+            multiworld.random.shuffle(items)
             count = 0
             err: typing.List[str] = []
             successful_pairs: typing.List[typing.Tuple[Item, Location]] = []
             for item_name in items:
-                item = world.worlds[player].create_item(item_name)
+                item = multiworld.worlds[player].create_item(item_name)
                 for location in reversed(candidates):
                     if (location.address is None) == (item.code is None):  # either both None or both not None
                         if not location.item:
                             if location.item_rule(item):
-                                if location.can_fill(world.state, item, False):
+                                if location.can_fill(multiworld.state, item, False):
                                     successful_pairs.append((item, location))
                                     candidates.remove(location)
                                     count = count + 1
@@ -945,21 +945,21 @@ def failed(warning: str, force: typing.Union[bool, str]) -> None:
             if count < placement['count']['min']:
                 m = placement['count']['min']
                 failed(
-                    f"Plando block failed to place {m - count} of {m} item(s) for {world.player_name[player]}, error(s): {' '.join(err)}",
+                    f"Plando block failed to place {m - count} of {m} item(s) for {multiworld.player_name[player]}, error(s): {' '.join(err)}",
                     placement['force'])
             for (item, location) in successful_pairs:
-                world.push_item(location, item, collect=False)
+                multiworld.push_item(location, item, collect=False)
                 location.event = True  # flag location to be checked during fill
                 location.locked = True
                 logging.debug(f"Plando placed {item} at {location}")
                 if from_pool:
                     try:
-                        world.itempool.remove(item)
+                        multiworld.itempool.remove(item)
                     except ValueError:
                         warn(
-                            f"Could not remove {item} from pool for {world.player_name[player]} as it's already missing from it.",
+                            f"Could not remove {item} from pool for {multiworld.player_name[player]} as it's already missing from it.",
                             placement['force'])
 
         except Exception as e:
             raise Exception(
-                f"Error running plando for player {player} ({world.player_name[player]})") from e
+                f"Error running plando for player {player} ({multiworld.player_name[player]})") from e
diff --git a/Main.py b/Main.py
index e49d8e781df9..f1d2f63692d6 100644
--- a/Main.py
+++ b/Main.py
@@ -30,49 +30,49 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
         output_path.cached_path = args.outputpath
 
     start = time.perf_counter()
-    # initialize the world
-    world = MultiWorld(args.multi)
+    # initialize the multiworld
+    multiworld = MultiWorld(args.multi)
 
     logger = logging.getLogger()
-    world.set_seed(seed, args.race, str(args.outputname) if args.outputname else None)
-    world.plando_options = args.plando_options
-
-    world.shuffle = args.shuffle.copy()
-    world.logic = args.logic.copy()
-    world.mode = args.mode.copy()
-    world.difficulty = args.difficulty.copy()
-    world.item_functionality = args.item_functionality.copy()
-    world.timer = args.timer.copy()
-    world.goal = args.goal.copy()
-    world.boss_shuffle = args.shufflebosses.copy()
-    world.enemy_health = args.enemy_health.copy()
-    world.enemy_damage = args.enemy_damage.copy()
-    world.beemizer_total_chance = args.beemizer_total_chance.copy()
-    world.beemizer_trap_chance = args.beemizer_trap_chance.copy()
-    world.countdown_start_time = args.countdown_start_time.copy()
-    world.red_clock_time = args.red_clock_time.copy()
-    world.blue_clock_time = args.blue_clock_time.copy()
-    world.green_clock_time = args.green_clock_time.copy()
-    world.dungeon_counters = args.dungeon_counters.copy()
-    world.triforce_pieces_available = args.triforce_pieces_available.copy()
-    world.triforce_pieces_required = args.triforce_pieces_required.copy()
-    world.shop_shuffle = args.shop_shuffle.copy()
-    world.shuffle_prizes = args.shuffle_prizes.copy()
-    world.sprite_pool = args.sprite_pool.copy()
-    world.dark_room_logic = args.dark_room_logic.copy()
-    world.plando_items = args.plando_items.copy()
-    world.plando_texts = args.plando_texts.copy()
-    world.plando_connections = args.plando_connections.copy()
-    world.required_medallions = args.required_medallions.copy()
-    world.game = args.game.copy()
-    world.player_name = args.name.copy()
-    world.sprite = args.sprite.copy()
-    world.glitch_triforce = args.glitch_triforce  # This is enabled/disabled globally, no per player option.
-
-    world.set_options(args)
-    world.set_item_links()
-    world.state = CollectionState(world)
-    logger.info('Archipelago Version %s  -  Seed: %s\n', __version__, world.seed)
+    multiworld.set_seed(seed, args.race, str(args.outputname) if args.outputname else None)
+    multiworld.plando_options = args.plando_options
+
+    multiworld.shuffle = args.shuffle.copy()
+    multiworld.logic = args.logic.copy()
+    multiworld.mode = args.mode.copy()
+    multiworld.difficulty = args.difficulty.copy()
+    multiworld.item_functionality = args.item_functionality.copy()
+    multiworld.timer = args.timer.copy()
+    multiworld.goal = args.goal.copy()
+    multiworld.boss_shuffle = args.shufflebosses.copy()
+    multiworld.enemy_health = args.enemy_health.copy()
+    multiworld.enemy_damage = args.enemy_damage.copy()
+    multiworld.beemizer_total_chance = args.beemizer_total_chance.copy()
+    multiworld.beemizer_trap_chance = args.beemizer_trap_chance.copy()
+    multiworld.countdown_start_time = args.countdown_start_time.copy()
+    multiworld.red_clock_time = args.red_clock_time.copy()
+    multiworld.blue_clock_time = args.blue_clock_time.copy()
+    multiworld.green_clock_time = args.green_clock_time.copy()
+    multiworld.dungeon_counters = args.dungeon_counters.copy()
+    multiworld.triforce_pieces_available = args.triforce_pieces_available.copy()
+    multiworld.triforce_pieces_required = args.triforce_pieces_required.copy()
+    multiworld.shop_shuffle = args.shop_shuffle.copy()
+    multiworld.shuffle_prizes = args.shuffle_prizes.copy()
+    multiworld.sprite_pool = args.sprite_pool.copy()
+    multiworld.dark_room_logic = args.dark_room_logic.copy()
+    multiworld.plando_items = args.plando_items.copy()
+    multiworld.plando_texts = args.plando_texts.copy()
+    multiworld.plando_connections = args.plando_connections.copy()
+    multiworld.required_medallions = args.required_medallions.copy()
+    multiworld.game = args.game.copy()
+    multiworld.player_name = args.name.copy()
+    multiworld.sprite = args.sprite.copy()
+    multiworld.glitch_triforce = args.glitch_triforce  # This is enabled/disabled globally, no per player option.
+
+    multiworld.set_options(args)
+    multiworld.set_item_links()
+    multiworld.state = CollectionState(multiworld)
+    logger.info('Archipelago Version %s  -  Seed: %s\n', __version__, multiworld.seed)
 
     logger.info(f"Found {len(AutoWorld.AutoWorldRegister.world_types)} World Types:")
     longest_name = max(len(text) for text in AutoWorld.AutoWorldRegister.world_types)
@@ -103,93 +103,93 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
 
     # This assertion method should not be necessary to run if we are not outputting any multidata.
     if not args.skip_output:
-        AutoWorld.call_stage(world, "assert_generate")
+        AutoWorld.call_stage(multiworld, "assert_generate")
 
-    AutoWorld.call_all(world, "generate_early")
+    AutoWorld.call_all(multiworld, "generate_early")
 
     logger.info('')
 
-    for player in world.player_ids:
-        for item_name, count in world.worlds[player].options.start_inventory.value.items():
+    for player in multiworld.player_ids:
+        for item_name, count in multiworld.worlds[player].options.start_inventory.value.items():
             for _ in range(count):
-                world.push_precollected(world.create_item(item_name, player))
+                multiworld.push_precollected(multiworld.create_item(item_name, player))
 
-        for item_name, count in getattr(world.worlds[player].options,
+        for item_name, count in getattr(multiworld.worlds[player].options,
                                         "start_inventory_from_pool",
                                         StartInventoryPool({})).value.items():
             for _ in range(count):
-                world.push_precollected(world.create_item(item_name, player))
+                multiworld.push_precollected(multiworld.create_item(item_name, player))
             # remove from_pool items also from early items handling, as starting is plenty early.
-            early = world.early_items[player].get(item_name, 0)
+            early = multiworld.early_items[player].get(item_name, 0)
             if early:
-                world.early_items[player][item_name] = max(0, early-count)
+                multiworld.early_items[player][item_name] = max(0, early-count)
                 remaining_count = count-early
                 if remaining_count > 0:
-                    local_early = world.early_local_items[player].get(item_name, 0)
+                    local_early = multiworld.early_local_items[player].get(item_name, 0)
                     if local_early:
-                        world.early_items[player][item_name] = max(0, local_early - remaining_count)
+                        multiworld.early_items[player][item_name] = max(0, local_early - remaining_count)
                     del local_early
             del early
 
-    logger.info('Creating World.')
-    AutoWorld.call_all(world, "create_regions")
+    logger.info('Creating MultiWorld.')
+    AutoWorld.call_all(multiworld, "create_regions")
 
     logger.info('Creating Items.')
-    AutoWorld.call_all(world, "create_items")
+    AutoWorld.call_all(multiworld, "create_items")
 
     logger.info('Calculating Access Rules.')
 
-    for player in world.player_ids:
+    for player in multiworld.player_ids:
         # items can't be both local and non-local, prefer local
-        world.worlds[player].options.non_local_items.value -= world.worlds[player].options.local_items.value
-        world.worlds[player].options.non_local_items.value -= set(world.local_early_items[player])
+        multiworld.worlds[player].options.non_local_items.value -= multiworld.worlds[player].options.local_items.value
+        multiworld.worlds[player].options.non_local_items.value -= set(multiworld.local_early_items[player])
 
-    AutoWorld.call_all(world, "set_rules")
+    AutoWorld.call_all(multiworld, "set_rules")
 
-    for player in world.player_ids:
-        exclusion_rules(world, player, world.worlds[player].options.exclude_locations.value)
-        world.worlds[player].options.priority_locations.value -= world.worlds[player].options.exclude_locations.value
-        for location_name in world.worlds[player].options.priority_locations.value:
+    for player in multiworld.player_ids:
+        exclusion_rules(multiworld, player, multiworld.worlds[player].options.exclude_locations.value)
+        multiworld.worlds[player].options.priority_locations.value -= multiworld.worlds[player].options.exclude_locations.value
+        for location_name in multiworld.worlds[player].options.priority_locations.value:
             try:
-                location = world.get_location(location_name, player)
+                location = multiworld.get_location(location_name, player)
             except KeyError as e:  # failed to find the given location. Check if it's a legitimate location
-                if location_name not in world.worlds[player].location_name_to_id:
+                if location_name not in multiworld.worlds[player].location_name_to_id:
                     raise Exception(f"Unable to prioritize location {location_name} in player {player}'s world.") from e
             else:
                 location.progress_type = LocationProgressType.PRIORITY
 
     # Set local and non-local item rules.
-    if world.players > 1:
-        locality_rules(world)
+    if multiworld.players > 1:
+        locality_rules(multiworld)
     else:
-        world.worlds[1].options.non_local_items.value = set()
-        world.worlds[1].options.local_items.value = set()
+        multiworld.worlds[1].options.non_local_items.value = set()
+        multiworld.worlds[1].options.local_items.value = set()
     
-    AutoWorld.call_all(world, "generate_basic")
+    AutoWorld.call_all(multiworld, "generate_basic")
 
     # remove starting inventory from pool items.
     # Because some worlds don't actually create items during create_items this has to be as late as possible.
-    if any(getattr(world.worlds[player].options, "start_inventory_from_pool", None) for player in world.player_ids):
+    if any(getattr(multiworld.worlds[player].options, "start_inventory_from_pool", None) for player in multiworld.player_ids):
         new_items: List[Item] = []
         depletion_pool: Dict[int, Dict[str, int]] = {
-            player: getattr(world.worlds[player].options,
+            player: getattr(multiworld.worlds[player].options,
                             "start_inventory_from_pool",
                             StartInventoryPool({})).value.copy()
-            for player in world.player_ids
+            for player in multiworld.player_ids
         }
         for player, items in depletion_pool.items():
-            player_world: AutoWorld.World = world.worlds[player]
+            player_world: AutoWorld.World = multiworld.worlds[player]
             for count in items.values():
                 for _ in range(count):
                     new_items.append(player_world.create_filler())
         target: int = sum(sum(items.values()) for items in depletion_pool.values())
-        for i, item in enumerate(world.itempool):
+        for i, item in enumerate(multiworld.itempool):
             if depletion_pool[item.player].get(item.name, 0):
                 target -= 1
                 depletion_pool[item.player][item.name] -= 1
                 # quick abort if we have found all items
                 if not target:
-                    new_items.extend(world.itempool[i+1:])
+                    new_items.extend(multiworld.itempool[i+1:])
                     break
             else:
                 new_items.append(item)
@@ -199,19 +199,19 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
             for player, remaining_items in depletion_pool.items():
                 remaining_items = {name: count for name, count in remaining_items.items() if count}
                 if remaining_items:
-                    raise Exception(f"{world.get_player_name(player)}"
+                    raise Exception(f"{multiworld.get_player_name(player)}"
                                     f" is trying to remove items from their pool that don't exist: {remaining_items}")
-        assert len(world.itempool) == len(new_items), "Item Pool amounts should not change."
-        world.itempool[:] = new_items
+        assert len(multiworld.itempool) == len(new_items), "Item Pool amounts should not change."
+        multiworld.itempool[:] = new_items
 
     # temporary home for item links, should be moved out of Main
-    for group_id, group in world.groups.items():
+    for group_id, group in multiworld.groups.items():
         def find_common_pool(players: Set[int], shared_pool: Set[str]) -> Tuple[
             Optional[Dict[int, Dict[str, int]]], Optional[Dict[str, int]]
         ]:
             classifications: Dict[str, int] = collections.defaultdict(int)
             counters = {player: {name: 0 for name in shared_pool} for player in players}
-            for item in world.itempool:
+            for item in multiworld.itempool:
                 if item.player in counters and item.name in shared_pool:
                     counters[item.player][item.name] += 1
                     classifications[item.name] |= item.classification
@@ -246,13 +246,13 @@ def find_common_pool(players: Set[int], shared_pool: Set[str]) -> Tuple[
                 new_item.classification |= classifications[item_name]
                 new_itempool.append(new_item)
 
-        region = Region("Menu", group_id, world, "ItemLink")
-        world.regions.append(region)
+        region = Region("Menu", group_id, multiworld, "ItemLink")
+        multiworld.regions.append(region)
         locations = region.locations
-        for item in world.itempool:
+        for item in multiworld.itempool:
             count = common_item_count.get(item.player, {}).get(item.name, 0)
             if count:
-                loc = Location(group_id, f"Item Link: {item.name} -> {world.player_name[item.player]} {count}",
+                loc = Location(group_id, f"Item Link: {item.name} -> {multiworld.player_name[item.player]} {count}",
                                None, region)
                 loc.access_rule = lambda state, item_name = item.name, group_id_ = group_id, count_ = count: \
                     state.has(item_name, group_id_, count_)
@@ -263,10 +263,10 @@ def find_common_pool(players: Set[int], shared_pool: Set[str]) -> Tuple[
             else:
                 new_itempool.append(item)
 
-        itemcount = len(world.itempool)
-        world.itempool = new_itempool
+        itemcount = len(multiworld.itempool)
+        multiworld.itempool = new_itempool
 
-        while itemcount > len(world.itempool):
+        while itemcount > len(multiworld.itempool):
             items_to_add = []
             for player in group["players"]:
                 if group["link_replacement"]:
@@ -274,64 +274,64 @@ def find_common_pool(players: Set[int], shared_pool: Set[str]) -> Tuple[
                 else:
                     item_player = player
                 if group["replacement_items"][player]:
-                    items_to_add.append(AutoWorld.call_single(world, "create_item", item_player,
+                    items_to_add.append(AutoWorld.call_single(multiworld, "create_item", item_player,
                                                                 group["replacement_items"][player]))
                 else:
-                    items_to_add.append(AutoWorld.call_single(world, "create_filler", item_player))
-            world.random.shuffle(items_to_add)
-            world.itempool.extend(items_to_add[:itemcount - len(world.itempool)])
+                    items_to_add.append(AutoWorld.call_single(multiworld, "create_filler", item_player))
+            multiworld.random.shuffle(items_to_add)
+            multiworld.itempool.extend(items_to_add[:itemcount - len(multiworld.itempool)])
 
-    if any(world.item_links.values()):
-        world._all_state = None
+    if any(multiworld.item_links.values()):
+        multiworld._all_state = None
 
     logger.info("Running Item Plando.")
 
-    distribute_planned(world)
+    distribute_planned(multiworld)
 
     logger.info('Running Pre Main Fill.')
 
-    AutoWorld.call_all(world, "pre_fill")
+    AutoWorld.call_all(multiworld, "pre_fill")
 
-    logger.info(f'Filling the world with {len(world.itempool)} items.')
+    logger.info(f'Filling the multiworld with {len(multiworld.itempool)} items.')
 
-    if world.algorithm == 'flood':
-        flood_items(world)  # different algo, biased towards early game progress items
-    elif world.algorithm == 'balanced':
-        distribute_items_restrictive(world)
+    if multiworld.algorithm == 'flood':
+        flood_items(multiworld)  # different algo, biased towards early game progress items
+    elif multiworld.algorithm == 'balanced':
+        distribute_items_restrictive(multiworld)
 
-    AutoWorld.call_all(world, 'post_fill')
+    AutoWorld.call_all(multiworld, 'post_fill')
 
-    if world.players > 1 and not args.skip_prog_balancing:
-        balance_multiworld_progression(world)
+    if multiworld.players > 1 and not args.skip_prog_balancing:
+        balance_multiworld_progression(multiworld)
     else:
         logger.info("Progression balancing skipped.")
 
     # we're about to output using multithreading, so we're removing the global random state to prevent accidental use
-    world.random.passthrough = False
+    multiworld.random.passthrough = False
 
     if args.skip_output:
         logger.info('Done. Skipped output/spoiler generation. Total Time: %s', time.perf_counter() - start)
-        return world
+        return multiworld
 
     logger.info(f'Beginning output...')
-    outfilebase = 'AP_' + world.seed_name
+    outfilebase = 'AP_' + multiworld.seed_name
 
     output = tempfile.TemporaryDirectory()
     with output as temp_dir:
-        output_players = [player for player in world.player_ids if AutoWorld.World.generate_output.__code__
-                          is not world.worlds[player].generate_output.__code__]
+        output_players = [player for player in multiworld.player_ids if AutoWorld.World.generate_output.__code__
+                          is not multiworld.worlds[player].generate_output.__code__]
         with concurrent.futures.ThreadPoolExecutor(len(output_players) + 2) as pool:
-            check_accessibility_task = pool.submit(world.fulfills_accessibility)
+            check_accessibility_task = pool.submit(multiworld.fulfills_accessibility)
 
-            output_file_futures = [pool.submit(AutoWorld.call_stage, world, "generate_output", temp_dir)]
+            output_file_futures = [pool.submit(AutoWorld.call_stage, multiworld, "generate_output", temp_dir)]
             for player in output_players:
                 # skip starting a thread for methods that say "pass".
                 output_file_futures.append(
-                    pool.submit(AutoWorld.call_single, world, "generate_output", player, temp_dir))
+                    pool.submit(AutoWorld.call_single, multiworld, "generate_output", player, temp_dir))
 
             # collect ER hint info
             er_hint_data: Dict[int, Dict[int, str]] = {}
-            AutoWorld.call_all(world, 'extend_hint_information', er_hint_data)
+            AutoWorld.call_all(multiworld, 'extend_hint_information', er_hint_data)
 
             def write_multidata():
                 import NetUtils
@@ -340,38 +340,38 @@ def write_multidata():
                 games = {}
                 minimum_versions = {"server": AutoWorld.World.required_server_version, "clients": client_versions}
                 slot_info = {}
-                names = [[name for player, name in sorted(world.player_name.items())]]
-                for slot in world.player_ids:
-                    player_world: AutoWorld.World = world.worlds[slot]
+                names = [[name for player, name in sorted(multiworld.player_name.items())]]
+                for slot in multiworld.player_ids:
+                    player_world: AutoWorld.World = multiworld.worlds[slot]
                     minimum_versions["server"] = max(minimum_versions["server"], player_world.required_server_version)
                     client_versions[slot] = player_world.required_client_version
-                    games[slot] = world.game[slot]
-                    slot_info[slot] = NetUtils.NetworkSlot(names[0][slot - 1], world.game[slot],
-                                                           world.player_types[slot])
-                for slot, group in world.groups.items():
-                    games[slot] = world.game[slot]
-                    slot_info[slot] = NetUtils.NetworkSlot(group["name"], world.game[slot], world.player_types[slot],
+                    games[slot] = multiworld.game[slot]
+                    slot_info[slot] = NetUtils.NetworkSlot(names[0][slot - 1], multiworld.game[slot],
+                                                           multiworld.player_types[slot])
+                for slot, group in multiworld.groups.items():
+                    games[slot] = multiworld.game[slot]
+                    slot_info[slot] = NetUtils.NetworkSlot(group["name"], multiworld.game[slot], multiworld.player_types[slot],
                                                            group_members=sorted(group["players"]))
                 precollected_items = {player: [item.code for item in world_precollected if type(item.code) == int]
-                                      for player, world_precollected in world.precollected_items.items()}
-                precollected_hints = {player: set() for player in range(1, world.players + 1 + len(world.groups))}
+                                      for player, world_precollected in multiworld.precollected_items.items()}
+                precollected_hints = {player: set() for player in range(1, multiworld.players + 1 + len(multiworld.groups))}
 
-                for slot in world.player_ids:
-                    slot_data[slot] = world.worlds[slot].fill_slot_data()
+                for slot in multiworld.player_ids:
+                    slot_data[slot] = multiworld.worlds[slot].fill_slot_data()
 
                 def precollect_hint(location):
                     entrance = er_hint_data.get(location.player, {}).get(location.address, "")
                     hint = NetUtils.Hint(location.item.player, location.player, location.address,
                                          location.item.code, False, entrance, location.item.flags)
                     precollected_hints[location.player].add(hint)
-                    if location.item.player not in world.groups:
+                    if location.item.player not in multiworld.groups:
                         precollected_hints[location.item.player].add(hint)
                     else:
-                        for player in world.groups[location.item.player]["players"]:
+                        for player in multiworld.groups[location.item.player]["players"]:
                             precollected_hints[player].add(hint)
 
-                locations_data: Dict[int, Dict[int, Tuple[int, int, int]]] = {player: {} for player in world.player_ids}
-                for location in world.get_filled_locations():
+                locations_data: Dict[int, Dict[int, Tuple[int, int, int]]] = {player: {} for player in multiworld.player_ids}
+                for location in multiworld.get_filled_locations():
                     if type(location.address) == int:
                         assert location.item.code is not None, "item code None should be event, " \
                                                                "location.address should then also be None. Location: " \
@@ -381,18 +381,18 @@ def precollect_hint(location):
                             f"{locations_data[location.player][location.address]}")
                         locations_data[location.player][location.address] = \
                             location.item.code, location.item.player, location.item.flags
-                        if location.name in world.worlds[location.player].options.start_location_hints:
+                        if location.name in multiworld.worlds[location.player].options.start_location_hints:
                             precollect_hint(location)
-                        elif location.item.name in world.worlds[location.item.player].options.start_hints:
+                        elif location.item.name in multiworld.worlds[location.item.player].options.start_hints:
                             precollect_hint(location)
-                        elif any([location.item.name in world.worlds[player].options.start_hints
-                                  for player in world.groups.get(location.item.player, {}).get("players", [])]):
+                        elif any([location.item.name in multiworld.worlds[player].options.start_hints
+                                  for player in multiworld.groups.get(location.item.player, {}).get("players", [])]):
                             precollect_hint(location)
 
                 # embedded data package
                 data_package = {
                     game_world.game: worlds.network_data_package["games"][game_world.game]
-                    for game_world in world.worlds.values()
+                    for game_world in multiworld.worlds.values()
                 }
 
                 checks_in_area: Dict[int, Dict[str, Union[int, List[int]]]] = {}
@@ -400,7 +400,7 @@ def precollect_hint(location):
                 multidata = {
                     "slot_data": slot_data,
                     "slot_info": slot_info,
-                    "connect_names": {name: (0, player) for player, name in world.player_name.items()},
+                    "connect_names": {name: (0, player) for player, name in multiworld.player_name.items()},
                     "locations": locations_data,
                     "checks_in_area": checks_in_area,
                     "server_options": baked_server_options,
@@ -410,10 +410,10 @@ def precollect_hint(location):
                     "version": tuple(version_tuple),
                     "tags": ["AP"],
                     "minimum_versions": minimum_versions,
-                    "seed_name": world.seed_name,
+                    "seed_name": multiworld.seed_name,
                     "datapackage": data_package,
                 }
-                AutoWorld.call_all(world, "modify_multidata", multidata)
+                AutoWorld.call_all(multiworld, "modify_multidata", multidata)
 
                 multidata = zlib.compress(pickle.dumps(multidata), 9)
 
@@ -423,7 +423,7 @@ def precollect_hint(location):
 
             output_file_futures.append(pool.submit(write_multidata))
             if not check_accessibility_task.result():
-                if not world.can_beat_game():
+                if not multiworld.can_beat_game():
                     raise Exception("Game appears as unbeatable. Aborting.")
                 else:
                     logger.warning("Location Accessibility requirements not fulfilled.")
@@ -436,12 +436,12 @@ def precollect_hint(location):
 
         if args.spoiler > 1:
             logger.info('Calculating playthrough.')
-            world.spoiler.create_playthrough(create_paths=args.spoiler > 2)
+            multiworld.spoiler.create_playthrough(create_paths=args.spoiler > 2)
 
         if args.spoiler:
-            world.spoiler.to_file(os.path.join(temp_dir, '%s_Spoiler.txt' % outfilebase))
+            multiworld.spoiler.to_file(os.path.join(temp_dir, '%s_Spoiler.txt' % outfilebase))
 
-        zipfilename = output_path(f"AP_{world.seed_name}.zip")
+        zipfilename = output_path(f"AP_{multiworld.seed_name}.zip")
         logger.info(f"Creating final archive at {zipfilename}")
         with zipfile.ZipFile(zipfilename, mode="w", compression=zipfile.ZIP_DEFLATED,
                              compresslevel=9) as zf:
@@ -449,4 +449,4 @@ def precollect_hint(location):
                 zf.write(file.path, arcname=file.name)
 
     logger.info('Done. Enjoy. Total Time: %s', time.perf_counter() - start)
-    return world
+    return multiworld
diff --git a/OoTAdjuster.py b/OoTAdjuster.py
index 38ebe62e2ae1..9519b191e704 100644
--- a/OoTAdjuster.py
+++ b/OoTAdjuster.py
@@ -195,10 +195,10 @@ def set_icon(window):
     window.tk.call('wm', 'iconphoto', window._w, logo)
 
 def adjust(args):
-    # Create a fake world and OOTWorld to use as a base
-    world = MultiWorld(1)
-    world.per_slot_randoms = {1: random}
-    ootworld = OOTWorld(world, 1)
+    # Create a fake multiworld and OOTWorld to use as a base
+    multiworld = MultiWorld(1)
+    multiworld.per_slot_randoms = {1: random}
+    ootworld = OOTWorld(multiworld, 1)
     # Set options in the fake OOTWorld
     for name, option in chain(cosmetic_options.items(), sfx_options.items()):
         result = getattr(args, name, None)
diff --git a/Utils.py b/Utils.py
index f6e4a9ab6052..8b91226bed9f 100644
--- a/Utils.py
+++ b/Utils.py
@@ -871,8 +871,8 @@ def visualize_regions(root_region: Region, file_name: str, *,
 
     Example usage in Main code:
     from Utils import visualize_regions
-    for player in world.player_ids:
-        visualize_regions(world.get_region("Menu", player), f"{world.get_out_file_name_base(player)}.puml")
+    for player in multiworld.player_ids:
+        visualize_regions(multiworld.get_region("Menu", player), f"{multiworld.get_out_file_name_base(player)}.puml")
     """
     assert root_region.multiworld, "The multiworld attribute of root_region has to be filled"
     from BaseClasses import Entrance, Item, Location, LocationProgressType, MultiWorld, Region
diff --git a/WebHostLib/templates/macros.html b/WebHostLib/templates/macros.html
index 0722ee317466..9cb48009a427 100644
--- a/WebHostLib/templates/macros.html
+++ b/WebHostLib/templates/macros.html
@@ -22,7 +22,7 @@
             {% for patch in room.seed.slots|list|sort(attribute="player_id") %}
                 <tr>
                     <td>{{ patch.player_id }}</td>
-                    <td data-tooltip="Connect via TextClient"><a href="archipelago://{{ patch.player_name | e}}:@{{ config['HOST_ADDRESS'] }}:{{ room.last_port }}">{{ patch.player_name }}</a></td>
+                    <td data-tooltip="Connect via TextClient"><a href="archipelago://{{ patch.player_name | e}}:None@{{ config['HOST_ADDRESS'] }}:{{ room.last_port }}">{{ patch.player_name }}</a></td>
                     <td>{{ patch.game }}</td>
                     <td>
                         {% if patch.data %}
diff --git a/docs/network protocol.md b/docs/network protocol.md
index d10e6519a93b..338db55299b6 100644
--- a/docs/network protocol.md	
+++ b/docs/network protocol.md	
@@ -27,6 +27,8 @@ There are also a number of community-supported libraries available that implemen
 | Haxe                          | [hxArchipelago](https://lib.haxe.org/p/hxArchipelago)                                              |                                                                                 |
 | Rust                          | [ArchipelagoRS](https://github.com/ryanisaacg/archipelago_rs)                                      |                                                                                 |
 | Lua                           | [lua-apclientpp](https://github.com/black-sliver/lua-apclientpp)                                   |                                                                                 |
+| Game Maker + Studio 1.x       | [gm-apclientpp](https://github.com/black-sliver/gm-apclientpp)                                     | For GM7, GM8 and GMS1.x, maybe older                                            |
+| GameMaker: Studio 2.x+        | [see Discord](https://discord.com/channels/731205301247803413/1166418532519653396)                 |                                                                                 |
 
 ## Synchronizing Items
 When the client receives a [ReceivedItems](#ReceivedItems) packet, if the `index` argument does not match the next index that the client expects then it is expected that the client will re-sync items with the server. This can be accomplished by sending the server a [Sync](#Sync) packet and then a [LocationChecks](#LocationChecks) packet.
diff --git a/docs/options api.md b/docs/options api.md
index 48a3f763fa92..bfab0096bbaf 100644
--- a/docs/options api.md	
+++ b/docs/options api.md	
@@ -27,14 +27,15 @@ Choice, and defining `alias_true = option_full`.
 - All options support `random` as a generic option. `random` chooses from any of the available values for that option,
 and is reserved by AP. You can set this as your default value, but you cannot define your own `option_random`.
 
-As an example, suppose we want an option that lets the user start their game with a sword in their inventory. Let's
-create our option class (with a docstring), give it a `display_name`, and add it to our game's options dataclass:
+As an example, suppose we want an option that lets the user start their game with a sword in their inventory, an option
+to let the player choose the difficulty, and an option to choose how much health the final boss has. Let's create our
+option classes (with a docstring), give them a `display_name`, and add them to our game's options dataclass:
 
 ```python
 # options.py
 from dataclasses import dataclass
 
-from Options import Toggle, PerGameCommonOptions
+from Options import Toggle, Range, Choice, PerGameCommonOptions
 
 
 class StartingSword(Toggle):
@@ -42,13 +43,33 @@ class StartingSword(Toggle):
     display_name = "Start With Sword"
 
 
+class Difficulty(Choice):
+    """Sets overall game difficulty."""
+    display_name = "Difficulty"
+    option_easy = 0
+    option_normal = 1
+    option_hard = 2
+    alias_beginner = 0  # same as easy but allows the player to use beginner as an alternative for easy in the result in their options
+    alias_expert = 2  # same as hard
+    default = 1  # default to normal
+
+
+class FinalBossHP(Range):
+    """Sets the HP of the final boss"""
+    display_name = "Final Boss HP"
+    range_start = 100
+    range_end = 10000
+    default = 2000
+
+
 @dataclass
 class ExampleGameOptions(PerGameCommonOptions):
     starting_sword: StartingSword
+    difficulty: Difficulty
+    final_boss_health: FinalBossHP
 ```
 
-This will create a `Toggle` option, internally called `starting_sword`. To then submit this to the multiworld, we add it
-to our world's `__init__.py`:
+To then submit this to the multiworld, we add it to our world's `__init__.py`:
 
 ```python
 from worlds.AutoWorld import World
diff --git a/docs/style.md b/docs/style.md
index 4cc8111425e3..fbf681f28e97 100644
--- a/docs/style.md
+++ b/docs/style.md
@@ -6,7 +6,6 @@
 * 120 character per line for all source files.
 * Avoid white space errors like trailing spaces.
 
-
 ## Python Code
 
 * We mostly follow [PEP8](https://peps.python.org/pep-0008/). Read below to see the differences.
@@ -18,9 +17,10 @@
 * Use type annotations where possible for function signatures and class members.
 * Use type annotations where appropriate for local variables (e.g. `var: List[int] = []`, or when the
   type is hard or impossible to deduce.) Clear annotations help developers look up and validate API calls.
+* New classes, attributes, and methods in core code should have docstrings that follow
+  [reST style](https://peps.python.org/pep-0287/).
 * Worlds that do not follow PEP8 should still have a consistent style across its files to make reading easier.
 
-
 ## Markdown
 
 * We almost follow [Google's styleguide](https://google.github.io/styleguide/docguide/style.html).
@@ -30,20 +30,17 @@
 * One space between bullet/number and text.
 * No lazy numbering.
 
-
 ## HTML
 
 * Indent with 2 spaces for new code.
 * kebab-case for ids and classes.
 
-
 ## CSS
 
 * Indent with 2 spaces for new code.
 * `{` on the same line as the selector.
 * No space between selector and `{`.
 
-
 ## JS
 
 * Indent with 2 spaces.
diff --git a/docs/world api.md b/docs/world api.md
index 0ab06da65603..72a67bca9de3 100644
--- a/docs/world api.md	
+++ b/docs/world api.md	
@@ -1,95 +1,95 @@
 # Archipelago API
 
-This document tries to explain some internals required to implement a game for
-Archipelago's generation and server. Once a seed is generated, a client or mod is 
-required to send and receive items between the game and server.
+This document tries to explain some aspects of the Archipelago World API used when implementing the generation logic of
+a game.
 
-Client implementation is out of scope of this document. Please refer to an
-existing game that provides a similar API to yours.
-Refer to the following documents as well:
-- [network protocol.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/network%20protocol.md)
-- [adding games.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/adding%20games.md)
+Client implementation is out of scope of this document. Please refer to an existing game that provides a similar API to
+yours, and the following documents:
 
-Archipelago will be abbreviated as "AP" from now on.
+* [network protocol.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/network%20protocol.md)
+* [adding games.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/adding%20games.md)
 
+Archipelago will be abbreviated as "AP" from now on.
 
 ## Language
 
 AP worlds are written in python3.
-Clients that connect to the server to sync items can be in any language that
-allows using WebSockets.
-
+Clients that connect to the server to sync items can be in any language that allows using WebSockets.
 
 ## Coding style
 
-AP follows [style.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/style.md).
-When in doubt use an IDE with coding style linter, for example PyCharm Community Edition.
-
+AP follows a [style guide](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/style.md).
+When in doubt, use an IDE with a code-style linter, for example PyCharm Community Edition.
 
 ## Docstrings
 
-Docstrings are strings attached to an object in Python that describe what the
-object is supposed to be. Certain docstrings will be picked up and used by AP.
-They are assigned by writing a string without any assignment right below a
-definition. The string must be a triple-quoted string.
+Docstrings are strings attached to an object in Python that describe what the object is supposed to be. Certain
+docstrings will be picked up and used by AP. They are assigned by writing a string without any assignment right below a
+definition. The string must be a triple-quoted string, and should
+follow [reST style](https://peps.python.org/pep-0287/).
+
 Example:
+
 ```python
 from worlds.AutoWorld import World
+
+
 class MyGameWorld(World):
-    """This is the description of My Game that will be displayed on the AP
-       website."""
+    """This is the description of My Game that will be displayed on the AP website."""
 ```
 
-
 ## Definitions
 
-This section will cover various classes and objects you can use for your world.
-While some of the attributes and methods are mentioned here, not all of them are,
-but you can find them in `BaseClasses.py`.
+This section covers various classes and objects you can use for your world. While some of the attributes and methods
+are mentioned here, not all of them are, but you can find them in
+[`BaseClasses.py`](https://github.com/ArchipelagoMW/Archipelago/blob/main/BaseClasses.py).
 
 ### World Class
 
-A `World` class is the class with all the specifics of a certain game to be
-included. It will be instantiated for each player that rolls a seed for that
-game.
+A `World` is the class with all the specifics of a certain game that is to be included. A new instance will be created
+for each player of the game for any given generated multiworld.
 
 ### WebWorld Class
 
-A `WebWorld` class contains specific attributes and methods that can be modified
-for your world specifically on the webhost:
+A `WebWorld` class contains specific attributes and methods that can be modified for your world specifically on the
+webhost:
 
-`settings_page`, which can be changed to a link instead of an AP generated settings page.
+* `options_page` can be changed to a link instead of an AP-generated options page.
 
-`theme` to be used for your game specific AP pages. Available themes:
+* `theme` to be used for your game-specific AP pages. Available themes:
 
-| dirt  | grass (default) | grassFlowers | ice  | jungle  | ocean | partyTime | stone |
-|---|---|---|---|---|---|---|---|
-| <img src="img/theme_dirt.JPG" width="100"> | <img src="img/theme_grass.JPG" width="100"> | <img src="img/theme_grassFlowers.JPG" width="100"> | <img src="img/theme_ice.JPG" width="100"> | <img src="img/theme_jungle.JPG" width="100"> | <img src="img/theme_ocean.JPG" width="100"> | <img src="img/theme_partyTime.JPG" width="100"> | <img src="img/theme_stone.JPG" width="100"> |
+  | dirt                                       | grass (default)                             | grassFlowers                                       | ice                                       | jungle                                       | ocean                                       | partyTime                                       | stone                                       |
+  |--------------------------------------------|---------------------------------------------|----------------------------------------------------|-------------------------------------------|----------------------------------------------|---------------------------------------------|-------------------------------------------------|---------------------------------------------|
+  | <img src="img/theme_dirt.JPG" width="100"> | <img src="img/theme_grass.JPG" width="100"> | <img src="img/theme_grassFlowers.JPG" width="100"> | <img src="img/theme_ice.JPG" width="100"> | <img src="img/theme_jungle.JPG" width="100"> | <img src="img/theme_ocean.JPG" width="100"> | <img src="img/theme_partyTime.JPG" width="100"> | <img src="img/theme_stone.JPG" width="100"> |
 
-`bug_report_page` (optional) can be a link to a bug reporting page, most likely a GitHub issue page, that will be placed by the site to help direct users to report bugs.
+* `bug_report_page` (optional) can be a link to a bug reporting page, most likely a GitHub issue page, that will be
+  placed by the site to help users report bugs.
 
-`tutorials` list of `Tutorial` classes where each class represents a guide to be generated on the webhost.
+* `tutorials` list of `Tutorial` classes where each class represents a guide to be generated on the webhost.
 
-`game_info_languages` (optional) List of strings for defining the existing gameinfo pages your game supports. The documents must be
-prefixed with the same string as defined here. Default already has 'en'.
+* `game_info_languages` (optional) list of strings for defining the existing game info pages your game supports. The
+  documents must be prefixed with the same string as defined here. Default already has 'en'.
 
-`options_presets` (optional) A `Dict[str, Dict[str, Any]]` where the keys are the names of the presets and the values 
-are the options to be set for that preset. The options are defined as a `Dict[str, Any]` where the keys are the names of
-the options and the values are the values to be set for that option. These presets will be available for users to select from on the game's options page.
+* `options_presets` (optional) `Dict[str, Dict[str, Any]]` where the keys are the names of the presets and the values
+  are the options to be set for that preset. The options are defined as a `Dict[str, Any]` where the keys are the names
+  of the options and the values are the values to be set for that option. These presets will be available for users to
+  select from on the game's options page.
 
 Note: The values must be a non-aliased value for the option type and can only include the following option types:
 
-  - If you have a `Range`/`NamedRange` option, the value should be an `int` between the `range_start` and `range_end`
-    values.
-    - If you have a `NamedRange` option, the value can alternatively be a `str` that is one of the 
+* If you have a `Range`/`NamedRange` option, the value should be an `int` between the `range_start` and `range_end`
+  values.
+    * If you have a `NamedRange` option, the value can alternatively be a `str` that is one of the
       `special_range_names` keys.
-  - If you have a `Choice` option, the value should be a `str` that is one of the `option_<name>` values. 
-  - If you have a `Toggle`/`DefaultOnToggle` option, the value should be a `bool`.
-  - `random` is also a valid value for any of these option types.
+* If you have a `Choice` option, the value should be a `str` that is one of the `option_<name>` values.
+* If you have a `Toggle`/`DefaultOnToggle` option, the value should be a `bool`.
+* `random` is also a valid value for any of these option types.
 
-`OptionDict`, `OptionList`, `OptionSet`, `FreeText`, or custom `Option`-derived classes are not supported for presets on the webhost at this time.
+`OptionDict`, `OptionList`, `OptionSet`, `FreeText`, or custom `Option`-derived classes are not supported for presets on
+the webhost at this time.
 
 Here is an example of a defined preset:
+
 ```python
 # presets.py
 options_presets = {
@@ -114,6 +114,7 @@ options_presets = {
     }
 }
 
+
 # __init__.py
 class RLWeb(WebWorld):
     options_presets = options_presets
@@ -122,47 +123,55 @@ class RLWeb(WebWorld):
 
 ### MultiWorld Object
 
-The `MultiWorld` object references the whole multiworld (all items and locations
-for all players) and is accessible through `self.multiworld` inside a `World` object.
+The `MultiWorld` object references the whole multiworld (all items and locations for all players) and is accessible
+through `self.multiworld` from your `World` object.
 
 ### Player
 
-The player is just an integer in AP and is accessible through `self.player`
-inside a `World` object.
+The player is just an `int` in AP and is accessible through `self.player` from your `World` object.
 
 ### Player Options
 
-Players provide customized settings for their World in the form of yamls.
-A `dataclass` of valid options definitions has to be provided in `self.options_dataclass`.
-(It must be a subclass of `PerGameCommonOptions`.)
-Option results are automatically added to the `World` object for easy access.
-Those are accessible through `self.options.<option_name>`, and you can get a dictionary of the option values via
-`self.options.as_dict(<option_names>)`, passing the desired options as strings. 
+Options are provided by the user as part of the generation process, intended to affect how their randomizer experience
+should play out. These can control aspects such as what locations should be shuffled, what items are in the itempool,
+etc. Players provide the customized options for their World in the form of yamls.
+
+By convention, options are defined in `options.py` and will be used when parsing the players' yaml files. Each option
+has its own class, which inherits from a base option type, a docstring to describe it, and a `display_name` property
+shown on the website and in spoiler logs.
+
+The available options are defined by creating a `dataclass`, which must be a subclass of `PerGameCommonOptions`. It has
+defined fields for the option names used in the player yamls and used for options access, with their types matching the
+appropriate Option class. By convention, the strings that define your option names should be in `snake_case`. The
+`dataclass` is then assigned to your `World` by defining its `options_dataclass`. Option results are then automatically
+added to the `World` object for easy access, between `World` creation and `generate_early`. These are accessible through
+`self.options.<option_name>`, and you can get a dictionary with option values
+via `self.options.as_dict(<option_names>)`,
+passing the desired option names as strings.
+
+Common option types are `Toggle`, `DefaultOnToggle`, `Choice`, and `Range`.
+For more information, see the [options api doc](options%20api.md).
 
 ### World Settings
 
-Any AP installation can provide settings for a world, for example a ROM file, accessible through
-`self.settings.<setting_name>` or `cls.settings.<setting_name>` (new API)
-or `Utils.get_options()["<world>_options"]["<setting_name>"]` (deprecated).
+Settings are set by the user outside the generation process. They can be used for those settings that may affect
+generation or client behavior, but should remain static between generations, such as the path to a ROM file.
+These settings are accessible through `self.settings.<setting_name>` or `cls.settings.<setting_name>`.
 
-Users can set those in their `host.yaml` file. Some settings may automatically open a file browser if a file is missing.
+Users can set these in their `host.yaml` file. Some settings may automatically open a file browser if a file is missing.
 
-Refer to [settings api.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/settings%20api.md)
-for details.
+Refer to [settings api.md](https://github.com/ArchipelagoMW/Archipelago/blob/main/docs/settings%20api.md) for details.
 
 ### Locations
 
-Locations are places where items can be located in your game. This may be chests
-or boss drops for RPG-like games but could also be progress in a research tree.
+Locations are places where items can be located in your game. This may be chests or boss drops for RPG-like games, but
+could also be progress in a research tree, or even something more abstract like a level up.
 
-Each location has a `name` and an `id` (a.k.a. "code" or "address"), is placed
-in a Region, has access rules and a classification.
-The name needs to be unique in each game and must not be numeric (has to
-contain least 1 letter or symbol). The ID needs to be unique across all games
-and is best in the same range as the item IDs.
-World-specific IDs are 1 to 2<sup>53</sup>-1, IDs ≤ 0 are global and reserved.
+Each location has a `name` and an `address` (hereafter referred to as an `id`), is placed in a Region, has access rules,
+and has a classification. The name needs to be unique within each game and must not be numeric (must contain least 1
+letter or symbol). The ID needs to be unique across all games, and is best kept in the same range as the item IDs.
 
-Special locations with ID `None` can hold events.
+World-specific IDs must be in the range 1 to 2<sup>53</sup>-1; IDs ≤ 0 are global and reserved.
 
 Classification is one of `LocationProgressType.DEFAULT`, `PRIORITY` or `EXCLUDED`.
 The Fill algorithm will force progression items to be placed at priority locations, giving a higher chance of them being
@@ -170,22 +179,21 @@ required, and will prevent progression and useful items from being placed at exc
 
 #### Documenting Locations
 
-Worlds can optionally provide a `location_descriptions` map which contains
-human-friendly descriptions of locations or location groups. These descriptions
-will show up in location-selection options in the Weighted Options page. Extra
+Worlds can optionally provide a `location_descriptions` map which contains human-friendly descriptions of locations and
+location groups. These descriptions will show up in location-selection options on the Weighted Options page. Extra
 indentation and single newlines will be collapsed into spaces.
 
 ```python
-# Locations.py
+# locations.py
 
 location_descriptions = {
     "Red Potion #6": "In a secret destructible block under the second stairway",
-    "L2 Spaceship": """
-      The group of all items in the spaceship in Level 2.
+    "L2 Spaceship":
+        """
+        The group of all items in the spaceship in Level 2.
 
-      This doesn't include the item on the spaceship door, since it can be
-      accessed without the Spaeship Key.
-    """
+        This doesn't include the item on the spaceship door, since it can be accessed without the Spaceship Key.
+        """
 }
 ```
 
@@ -193,7 +201,7 @@ location_descriptions = {
 # __init__.py
 
 from worlds.AutoWorld import World
-from .Locations import location_descriptions
+from .locations import location_descriptions
 
 
 class MyGameWorld(World):
@@ -202,47 +210,45 @@ class MyGameWorld(World):
 
 ### Items
 
-Items are all things that can "drop" for your game. This may be RPG items like
-weapons, could as well be technologies you normally research in a research tree.
+Items are all things that can "drop" for your game. This may be RPG items like weapons, or technologies you normally
+research in a research tree.
 
-Each item has a `name`, an `id` (can be known as "code"), and a classification.
-The most important classification is `progression` (formerly advancement).
-Progression items are items which a player may require to progress in
-their world. Progression items will be assigned to locations with higher
-priority and moved around to meet defined rules and accomplish progression
-balancing.
+Each item has a `name`, a `code` (hereafter referred to as `id`), and a classification.
+The most important classification is `progression`. Progression items are items which a player *may* require to progress
+in their world. If an item can possibly be considered for logic (it's referenced in a location's rules) it *must* be
+progression. Progression items will be assigned to locations with higher priority, and moved around to meet defined rules
+and satisfy progression balancing.
 
-The name needs to be unique in each game, meaning a duplicate item has the
-same ID. Name must not be numeric (has to contain at least 1 letter or symbol).
+The name needs to be unique within each game, meaning if you need to create multiple items with the same name, they
+will all have the same ID. Name must not be numeric (must contain at least 1 letter or symbol).
 
-Special items with ID `None` can mark events (read below).
+Other classifications include:
 
-Other classifications include
 * `filler`: a regular item or trash item
-* `useful`: generally quite useful, but not required for anything logical
+* `useful`: generally quite useful, but not required for anything logical. Cannot be placed on excluded locations
 * `trap`: negative impact on the player
 * `skip_balancing`: denotes that an item should not be moved to an earlier sphere for the purpose of balancing (to be
   combined with `progression`; see below)
 * `progression_skip_balancing`: the combination of `progression` and `skip_balancing`, i.e., a progression item that
-  will not be moved around by progression balancing; used, e.g., for currency or tokens
+  will not be moved around by progression balancing; used, e.g., for currency or tokens, to not flood early spheres
 
 #### Documenting Items
 
-Worlds can optionally provide an `item_descriptions` map which contains
-human-friendly descriptions of items or item groups. These descriptions will
-show up in item-selection options in the Weighted Options page. Extra
-indentation and single newlines will be collapsed into spaces.
+Worlds can optionally provide an `item_descriptions` map which contains human-friendly descriptions of items and item
+groups. These descriptions will show up in item-selection options on the Weighted Options page. Extra indentation and
+single newlines will be collapsed into spaces.
 
 ```python
-# Items.py
+# items.py
 
 item_descriptions = {
     "Red Potion": "A standard health potion",
-    "Spaceship Key": """
-      The key to the spaceship in Level 2.
+    "Spaceship Key":
+        """
+        The key to the spaceship in Level 2.
 
-      This is necessary to get to the Star Realm.
-    """
+        This is necessary to get to the Star Realm.
+        """
 }
 ```
 
@@ -250,7 +256,7 @@ item_descriptions = {
 # __init__.py
 
 from worlds.AutoWorld import World
-from .Items import item_descriptions
+from .items import item_descriptions
 
 
 class MyGameWorld(World):
@@ -259,215 +265,128 @@ class MyGameWorld(World):
 
 ### Events
 
-Events will mark some progress. You define an event location, an
-event item, strap some rules to the location (i.e. hold certain
-items) and manually place the event item at the event location.
+An Event is a special combination of a Location and an Item, with both having an `id` of `None`. These can be used to
+track certain logic interactions, with the Event Item being required for access in other locations or regions, but not
+being "real". Since the item and location have no ID, they get dropped at the end of generation and so the server is
+never made aware of them and these locations can never be checked, nor can the items be received during play.
+They may also be used for making the spoiler log look nicer, i.e. by having a `"Victory"` Event Item, that
+is required to finish the game. This makes it very clear when the player finishes, rather than only seeing their last
+relevant Item. Events function just like any other Location, and can still have their own access rules, etc.
+By convention, the Event "pair" of Location and Item typically have the same name, though this is not a requirement.
+They must not exist in the `name_to_id` lookups, as they have no ID.
+
+The most common way to create an Event pair is to create and place the Item on the Location as soon as it's created:
 
-Events can be used to either simplify the logic or to get better spoiler logs.
-Events will show up in the spoiler playthrough but they do not represent actual
-items or locations within the game.
+```python
+from worlds.AutoWorld import World
+from BaseClasses import ItemClassification
+from .subclasses import MyGameLocation, MyGameItem
 
-There is one special case for events: Victory. To get the win condition to show
-up in the spoiler log, you create an event item and place it at an event
-location with the `access_rules` for game completion. Once that's done, the
-world's win condition can be as simple as checking for that item.
 
-By convention the victory event is called `"Victory"`. It can be placed at one
-or more event locations based on player options.
+class MyGameWorld(World):
+    victory_loc = MyGameLocation(self.player, "Victory", None)
+    victory_loc.place_locked_item(MyGameItem("Victory", ItemClassification.progression, None, self.player))
+```
 
 ### Regions
 
-Regions are logical groups of locations that share some common access rules. If
-location logic is written from scratch, using regions greatly simplifies the
-definition and allows to somewhat easily implement things like entrance
-randomizer in logic.
+Regions are logical containers that typically hold locations that share some common access rules. If location logic is
+written from scratch, using regions greatly simplifies the requirements and can help with implementing things
+like entrance randomization in logic.
 
-Regions have a list called `exits`, which are `Entrance` objects representing
-transitions to other regions.
+Regions have a list called `exits`, containing `Entrance` objects representing transitions to other regions.
 
-There has to be one special region "Menu" from which the logic unfolds. AP
-assumes that a player will always be able to return to the "Menu" region by
-resetting the game ("Save and quit").
+There must be one special region, "Menu", from which the logic unfolds. AP assumes that a player will always be able to
+return to the "Menu" region by resetting the game ("Save and quit").
 
 ### Entrances
 
-An `Entrance` connects to a region, is assigned to region's exits and has rules
-to define if it and thus the connected region is accessible.
-They can be static (regular logic) or be defined/connected during generation
-(entrance randomizer).
+An `Entrance` has a `parent_region` and `connected_region`, where it is in the `exits` of its parent, and the
+`entrances` of its connected region. The `Entrance` then has rules assigned to it to determine if it can be passed
+through, making the connected region accessible. They can be static (regular logic) or be defined/connected during
+generation (entrance randomization).
 
 ### Access Rules
 
-An access rule is a function that returns `True` or `False` for a `Location` or
-`Entrance` based on the current `state` (items that can be collected).
+An access rule is a function that returns `True` or `False` for a `Location` or `Entrance` based on the current `state`
+(items that have been collected).
 
 ### Item Rules
 
-An item rule is a function that returns `True` or `False` for a `Location` based
-on a single item. It can be used to reject placement of an item there.
-
+An item rule is a function that returns `True` or `False` for a `Location` based on a single item. It can be used to
+reject the placement of an item there.
 
 ## Implementation
 
 ### Your World
 
-All code for your world implementation should be placed in a python package in
-the `/worlds` directory. The starting point for the package is `__init__.py`.
-Conventionally, your world class is placed in that file.
+All code for your world implementation should be placed in a python package in the `/worlds` directory. The starting
+point for the package is `__init__.py`. Conventionally, your `World` class is placed in that file.
 
-World classes must inherit from the `World` class in `/worlds/AutoWorld.py`,
-which can be imported as `from worlds.AutoWorld import World` from your package.
+World classes must inherit from the `World` class in `/worlds/AutoWorld.py`, which can be imported as
+`from worlds.AutoWorld import World` from your package.
 
 AP will pick up your world automatically due to the `AutoWorld` implementation.
 
 ### Requirements
 
-If your world needs specific python packages, they can be listed in
-`worlds/<world_name>/requirements.txt`. ModuleUpdate.py will automatically
-pick up and install them.
+If your world needs specific python packages, they can be listed in `worlds/<world_name>/requirements.txt`.
+ModuleUpdate.py will automatically pick up and install them.
 
 See [pip documentation](https://pip.pypa.io/en/stable/cli/pip_install/#requirements-file-format).
 
 ### Relative Imports
 
-AP will only import the `__init__.py`. Depending on code size it makes sense to
-use multiple files and use relative imports to access them.
+AP will only import the `__init__.py`. Depending on code size, it may make sense to use multiple files and use relative
+imports to access them.
 
-e.g. `from .options import MyGameOptions` from your `__init__.py` will load
-`world/[world_name]/options.py` and make its `MyGameOptions` accessible.
+e.g. `from .options import MyGameOptions` from your `__init__.py` will load `world/[world_name]/options.py` and make
+its `MyGameOptions` accessible.
 
-When imported names pile up it may be easier to use `from . import options`
-and access the variable as `options.MyGameOptions`.
+When imported names pile up, it may be easier to use `from . import options` and access the variable as
+`options.MyGameOptions`.
 
-Imports from directories outside your world should use absolute imports.
-Correct use of relative / absolute imports is required for zipped worlds to
-function, see [apworld specification.md](apworld%20specification.md).
+Imports from directories outside your world should use absolute imports. Correct use of relative / absolute imports is
+required for zipped worlds to function, see [apworld specification.md](apworld%20specification.md).
 
 ### Your Item Type
 
-Each world uses its own subclass of `BaseClasses.Item`. The constructor can be
-overridden to attach additional data to it, e.g. "price in shop".
-Since the constructor is only ever called from your code, you can add whatever
-arguments you like to the constructor.
+Each world uses its own subclass of `BaseClasses.Item`. The constructor can be overridden to attach additional data to
+it, e.g. "price in shop". Since the constructor is only ever called from your code, you can add whatever arguments you
+like to the constructor.
+
+In its simplest form, we only set the game name and use the default constructor:
 
-In its simplest form we only set the game name and use the default constructor
 ```python
 from BaseClasses import Item
 
+
 class MyGameItem(Item):
     game: str = "My Game"
 ```
-By convention this class definition will either be placed in your `__init__.py`
-or your `items.py`. For a more elaborate example see `worlds/oot/Items.py`.
 
-### Your location type
+By convention, this class definition will either be placed in your `__init__.py` or your `items.py`. For a more
+elaborate example see
+[`worlds/oot/Items.py`](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/oot/Items.py).
+
+### Your Location Type
+
+The same thing we did for items above, we will now do for locations:
 
-The same we have done for items above, we will do for locations
 ```python
 from BaseClasses import Location
 
+
 class MyGameLocation(Location):
     game: str = "My Game"
 
     # override constructor to automatically mark event locations as such
-    def __init__(self, player: int, name = "", code = None, parent = None) -> None:
+    def __init__(self, player: int, name="", code=None, parent=None) -> None:
         super(MyGameLocation, self).__init__(player, name, code, parent)
         self.event = code is None
 ```
-in your `__init__.py` or your `locations.py`.
-
-### Options
-
-By convention options are defined in `options.py` and will be used when parsing
-the players' yaml files.
-
-Each option has its own class, inherits from a base option type, has a docstring 
-to describe it and a `display_name` property for display on the website and in
-spoiler logs.
-
-The actual name as used in the yaml is defined via the field names of a `dataclass` that is
-assigned to the world under `self.options_dataclass`. By convention, the strings
-that define your option names should be in `snake_case`.
-
-Common option types are `Toggle`, `DefaultOnToggle`, `Choice`, `Range`.
-For more see `Options.py` in AP's base directory.
-
-#### Toggle, DefaultOnToggle
-
-These don't need any additional properties defined. After parsing the option,
-its `value` will either be True or False.
-
-#### Range
-
-Define properties `range_start`, `range_end` and `default`. Ranges will be
-displayed as sliders on the website and can be set to random in the yaml.
-
-#### Choice
-
-Choices are like toggles, but have more options than just True and False.
-Define a property `option_<name> = <number>` per selectable value and
-`default = <number>` to set the default selection. Aliases can be set by
-defining a property `alias_<name> = <same number>`.
-
-```python
-option_off = 0
-option_on = 1
-option_some = 2
-alias_disabled = 0
-alias_enabled = 1
-default = 0
-```
-
-#### Sample
-```python
-# options.py
-
-from dataclasses import dataclass
-from Options import Toggle, Range, Choice, PerGameCommonOptions
-
-class Difficulty(Choice):
-    """Sets overall game difficulty."""
-    display_name = "Difficulty"
-    option_easy = 0
-    option_normal = 1
-    option_hard = 2
-    alias_beginner = 0  # same as easy
-    alias_expert = 2  # same as hard
-    default = 1  # default to normal
-
-class FinalBossHP(Range):
-    """Sets the HP of the final boss"""
-    display_name = "Final Boss HP"
-    range_start = 100
-    range_end = 10000
-    default = 2000
-
-class FixXYZGlitch(Toggle):
-    """Fixes ABC when you do XYZ"""
-    display_name = "Fix XYZ Glitch"
-
-# By convention, we call the options dataclass `<world>Options`.
-# It has to be derived from 'PerGameCommonOptions'.
-@dataclass
-class MyGameOptions(PerGameCommonOptions):
-    difficulty: Difficulty
-    final_boss_hp: FinalBossHP
-    fix_xyz_glitch: FixXYZGlitch
-```
-
-```python
-# __init__.py
-
-from worlds.AutoWorld import World
-from .options import MyGameOptions  # import the options dataclass
-
 
-class MyGameWorld(World):
-    # ...
-    options_dataclass = MyGameOptions  # assign the options dataclass to the world
-    options: MyGameOptions  # typing for option results
-    # ...
-```
+in your `__init__.py` or your `locations.py`.
 
 ### A World Class Skeleton
 
@@ -483,7 +402,6 @@ from worlds.AutoWorld import World
 from BaseClasses import Region, Location, Entrance, Item, RegionType, ItemClassification
 
 
-
 class MyGameItem(Item):  # or from Items import MyGameItem
     game = "My Game"  # name of the game/world this item is from
 
@@ -492,7 +410,6 @@ class MyGameLocation(Location):  # or from Locations import MyGameLocation
     game = "My Game"  # name of the game/world this location is in
 
 
-
 class MyGameSettings(settings.Group):
     class RomFile(settings.SNESRomPath):
         """Insert help text for host.yaml here."""
@@ -511,7 +428,7 @@ class MyGameWorld(World):
     # ID of first item and location, could be hard-coded but code may be easier
     # to read with this as a property.
     base_id = 1234
-    # Instead of dynamic numbering, IDs could be part of data.
+    # instead of dynamic numbering, IDs could be part of data
 
     # The following two dicts are required for the generation to know which
     # items exist. They could be generated from json or something else. They can
@@ -530,74 +447,106 @@ class MyGameWorld(World):
 
 ### Generation
 
-The world has to provide the following things for generation
+The world has to provide the following things for generation:
 
-* the properties mentioned above 
+* the properties mentioned above
 * additions to the item pool
 * additions to the regions list: at least one called "Menu"
 * locations placed inside those regions
 * a `def create_item(self, item: str) -> MyGameItem` to create any item on demand
-* applying `self.multiworld.push_precollected` for world defined start inventory
-* `required_client_version: Tuple[int, int, int]`
-  Optional client version as tuple of 3 ints to make sure the client is compatible to
-  this world (e.g. implements all required features) when connecting.
+* applying `self.multiworld.push_precollected` for world-defined start inventory
 
-In addition, the following methods can be implemented and are called in this order during generation
+In addition, the following methods can be implemented and are called in this order during generation:
 
-* `stage_assert_generate(cls, multiworld)` is a class method called at the start of
-  generation to check the existence of prerequisite files, usually a ROM for
+* `stage_assert_generate(cls, multiworld: MultiWorld)`
+  a class method called at the start of generation to check for the existence of prerequisite files, usually a ROM for
   games which require one.
 * `generate_early(self)`
-  called per player before any items or locations are created. You can set properties on your world here. Already has
-  access to player options and RNG. This is the earliest step where the world should start setting up for the current
-  multiworld as any steps before this, the multiworld itself is still getting set up
+  called per player before any items or locations are created. You can set properties on your
+  world here. Already has access to player options and RNG. This is the earliest step where the world should start
+  setting up for the current multiworld, as the multiworld itself is still setting up before this point.
 * `create_regions(self)`
-  called to place player's regions and their locations into the MultiWorld's regions list. If it's
-  hard to separate, this can be done during `generate_early` or `create_items` as well.
+  called to place player's regions and their locations into the MultiWorld's regions list.
+  If it's hard to separate, this can be done during `generate_early` or `create_items` as well.
 * `create_items(self)`
-  called to place player's items into the MultiWorld's itempool. After this step all regions and items have to be in
-  the MultiWorld's regions and itempool, and these lists should not be modified afterwards.
+  called to place player's items into the MultiWorld's itempool. After this step all regions
+  and items have to be in the MultiWorld's regions and itempool, and these lists should not be modified afterward.
 * `set_rules(self)`
-  called to set access and item rules on locations and entrances. 
-  Locations have to be defined before this, or rule application can miss them.
+  called to set access and item rules on locations and entrances.
 * `generate_basic(self)`
-  called after the previous steps. Some placement and player specific
-  randomizations can be done here.
-* `pre_fill(self)`, `fill_hook(self)` and `post_fill(self)` are called to modify item placement
-  before, during and after the regular fill process, before `generate_output`.
-  If items need to be placed during pre_fill, these items can be determined
-  and created using `get_prefill_items`
-* `generate_output(self, output_directory: str)` that creates the output
-  files if there is output to be generated. When this is
-  called, `self.multiworld.get_locations(self.player)` has all locations for the player, with
-  attribute `item` pointing to the item.
-  `location.item.player` can be used to see if it's a local item.
+  player-specific randomization that does not affect logic can be done here.
+* `pre_fill(self)`, `fill_hook(self)` and `post_fill(self)`
+  called to modify item placement before, during, and after the regular fill process; all finishing before
+  `generate_output`. Any items that need to be placed during `pre_fill` should not exist in the itempool, and if there
+  are any items that need to be filled this way, but need to be in state while you fill other items, they can be
+  returned from `get_prefill_items`.
+* `generate_output(self, output_directory: str)`
+  creates the output files if there is output to be generated. When this is called,
+  `self.multiworld.get_locations(self.player)` has all locations for the player, with attribute `item` pointing to the
+  item. `location.item.player` can be used to see if it's a local item.
 * `fill_slot_data(self)` and `modify_multidata(self, multidata: Dict[str, Any])` can be used to modify the data that
   will be used by the server to host the MultiWorld.
 
+All instance methods can, optionally, have a class method defined which will be called after all instance methods are
+finished running, by defining a method with `stage_` in front of the method name. These class methods will have the
+args `(cls, multiworld: MultiWorld)`, followed by any other args that the relevant instance method has.
 
 #### generate_early
 
 ```python
 def generate_early(self) -> None:
-    # read player settings to world instance
+    # read player options to world instance
     self.final_boss_hp = self.options.final_boss_hp.value
 ```
 
+#### create_regions
+
+```python
+def create_regions(self) -> None:
+    # Add regions to the multiworld. "Menu" is the required starting point.
+    # Arguments to Region() are name, player, multiworld, and optionally hint_text
+    menu_region = Region("Menu", self.player, self.multiworld)
+    self.multiworld.regions.append(menu_region)  # or use += [menu_region...]
+
+    main_region = Region("Main Area", self.player, self.multiworld)
+    # add main area's locations to main area (all but final boss)
+    main_region.add_locations(main_region_locations, MyGameLocation)
+    # or 
+    # main_region.locations = \
+    #   [MyGameLocation(self.player, location_name, self.location_name_to_id[location_name], main_region]
+    self.multiworld.regions.append(main_region)
+
+    boss_region = Region("Boss Room", self.player, self.multiworld)
+    # add event to Boss Room
+    boss_region.locations.append(MyGameLocation(self.player, "Final Boss", None, boss_region))
+
+    # if entrances are not randomized, they should be connected here, otherwise they can also be connected at a later stage
+    # create Entrances and connect the Regions
+    menu_region.connect(main_region)  # connects the "Menu" and "Main Area", can also pass a rule
+    # or
+    main_region.add_exits({"Boss Room": "Boss Door"}, {"Boss Room": lambda state: state.has("Sword", self.player)})
+    # connects the "Main Area" and "Boss Room" regions, and places a rule requiring the "Sword" item to traverse
+
+    # if setting location access rules from data is easier here, set_rules can possibly be omitted
+```
+
 #### create_item
 
 ```python
-# we need a way to know if an item provides progress in the game ("key item")
-# this can be part of the items definition, or depend on recipe randomization
+# we need a way to know if an item provides progress in the game ("key item") this can be part of the items definition,
+# or depend on recipe randomization
 from .items import is_progression  # this is just a dummy
 
+
 def create_item(self, item: str) -> MyGameItem:
-    # This is called when AP wants to create an item by name (for plando) or
-    # when you call it from your own code.
-    classification = ItemClassification.progression if is_progression(item) else \
-                     ItemClassification.filler
-    return MyGameItem(item, classification, self.item_name_to_id[item],
-                      self.player)
+    # this is called when AP wants to create an item by name (for plando) or when you call it from your own code
+    classification = ItemClassification.progression if is_progression(item) else
+    ItemClassification.filler
+
+
+return MyGameItem(item, classification, self.item_name_to_id[item],
+                  self.player)
+
 
 def create_event(self, event: str) -> MyGameItem:
     # while we are at it, we can also add a helper to create events
@@ -610,8 +559,7 @@ def create_event(self, event: str) -> MyGameItem:
 def create_items(self) -> None:
     # Add items to the Multiworld.
     # If there are two of the same item, the item has to be twice in the pool.
-    # Which items are added to the pool may depend on player settings,
-    # e.g. custom win condition like triforce hunt.
+    # Which items are added to the pool may depend on player options, e.g. custom win condition like triforce hunt.
     # Having an item in the start inventory won't remove it from the pool.
     # If an item can't have duplicates it has to be excluded manually.
 
@@ -627,67 +575,10 @@ def create_items(self) -> None:
 
     # itempool and number of locations should match up.
     # If this is not the case we want to fill the itempool with junk.
-    junk = 0  # calculate this based on player settings
+    junk = 0  # calculate this based on player options
     self.multiworld.itempool += [self.create_item("nothing") for _ in range(junk)]
 ```
 
-#### create_regions
-
-```python
-def create_regions(self) -> None:
-    # Add regions to the multiworld. "Menu" is the required starting point.
-    # Arguments to Region() are name, player, world, and optionally hint_text
-    menu_region = Region("Menu", self.player, self.multiworld)
-    self.multiworld.regions.append(menu_region)  # or use += [menu_region...]
-    
-    main_region = Region("Main Area", self.player, self.multiworld)
-    # Add main area's locations to main area (all but final boss)
-    main_region.add_locations(main_region_locations, MyGameLocation)
-    # or 
-    # main_region.locations = \
-    #   [MyGameLocation(self.player, location_name, self.location_name_to_id[location_name], main_region]
-    self.multiworld.regions.append(main_region)
-    
-    boss_region = Region("Boss Room", self.player, self.multiworld)
-    # Add event to Boss Room
-    boss_region.locations.append(MyGameLocation(self.player, "Final Boss", None, boss_region))
-
-    # If entrances are not randomized, they should be connected here,
-    # otherwise they can also be connected at a later stage.
-    # Create Entrances and connect the Regions
-    menu_region.connect(main_region)  # connects the "Menu" and "Main Area", can also pass a rule
-    # or
-    main_region.add_exits({"Boss Room": "Boss Door"}, {"Boss Room": lambda state: state.has("Sword", self.player)})
-    # Connects the "Main Area" and "Boss Room" regions, and places a rule requiring the "Sword" item to traverse
-    
-    # If setting location access rules from data is easier here, set_rules can
-    # possibly omitted.
-```
-
-#### generate_basic
-
-```python
-def generate_basic(self) -> None:
-    # place "Victory" at "Final Boss" and set collection as win condition
-    self.multiworld.get_location("Final Boss", self.player)
-        .place_locked_item(self.create_event("Victory"))
-    self.multiworld.completion_condition[self.player] =
-        lambda state: state.has("Victory", self.player)
-
-    # place item Herb into location Chest1 for some reason
-    item = self.create_item("Herb")
-    self.multiworld.get_location("Chest1", self.player).place_locked_item(item)
-    # in most cases it's better to do this at the same time the itempool is
-    # filled to avoid accidental duplicates:
-    # manually placed and still in the itempool
-    
-    # for debugging purposes, you may want to visualize the layout of your world. Uncomment the following code to
-    # write a PlantUML diagram to the file "my_world.puml" that can help you see whether your regions and locations
-    # are connected and placed as desired
-    # from Utils import visualize_regions
-    # visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
-```
-
 ### Setting Rules
 
 ```python
@@ -703,6 +594,7 @@ def set_rules(self) -> None:
     # set a simple rule for an region
     set_rule(self.multiworld.get_entrance("Boss Door", self.player),
              lambda state: state.has("Boss Key", self.player))
+    # location.access_rule = ... is likely to be a bit faster
     # combine rules to require two items
     add_rule(self.multiworld.get_location("Chest2", self.player),
              lambda state: state.has("Sword", self.player))
@@ -730,59 +622,80 @@ def set_rules(self) -> None:
     # get_item_type needs to take player/world into account
     # if MyGameItem has a type property, a more direct implementation would be
     add_item_rule(self.multiworld.get_location("Chest5", self.player),
-                  lambda item: item.player != self.player or\
+                  lambda item: item.player != self.player or
                                item.my_type == "weapon")
     # location.item_rule = ... is likely to be a bit faster
-```
 
-### Logic Mixin
+    # place "Victory" at "Final Boss" and set collection as win condition
+    self.multiworld.get_location("Final Boss", self.player).place_locked_item(self.create_event("Victory"))
 
-While lambdas and events could do pretty much anything, by convention we
-implement more complex logic in logic mixins, even if there is no need to add
-properties to the `BaseClasses.CollectionState` state object.
-
-When importing a file that defines a class that inherits from
-`worlds.AutoWorld.LogicMixin` the state object's class is automatically extended by
-the mixin's members. These members should be prefixed with underscore following
-the name of the implementing world. This is due to sharing a namespace with all
-other logic mixins.
-
-Typical uses are defining methods that are used instead of `state.has`
-in lambdas, e.g.`state.mygame_has(custom, player)` or recurring checks
-like `state.mygame_can_do_something(player)` to simplify lambdas.
-Private members, only accessible from mixins, should start with `_mygame_`,
-public members with `mygame_`.
-
-More advanced uses could be to add additional variables to the state object,
-override `World.collect(self, state, item)` and `remove(self, state, item)`
-to update the state object, and check those added variables in added methods.
-Please do this with caution and only when necessary.
+    self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player)
+
+# for debugging purposes, you may want to visualize the layout of your world. Uncomment the following code to
+# write a PlantUML diagram to the file "my_world.puml" that can help you see whether your regions and locations
+# are connected and placed as desired
+# from Utils import visualize_regions
+# visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
+```
 
-#### Sample
+### Custom Logic Rules
+
+Custom methods can be defined for your logic rules. The access rule that ultimately gets assigned to the Location or
+Entrance should be
+a [`CollectionRule`](https://github.com/ArchipelagoMW/Archipelago/blob/main/worlds/generic/Rules.py#L9).
+Typically, this is done by defining a lambda expression on demand at the relevant bit, typically calling other
+functions, but this can also be achieved by defining a method with the appropriate format and assigning it directly.
+For an example, see [The Messenger](/worlds/messenger/rules.py).
 
 ```python
 # logic.py
 
-from worlds.AutoWorld import LogicMixin
+from BaseClasses import CollectionState
+
 
-class MyGameLogic(LogicMixin):
-    def mygame_has_key(self, player: int) -> bool:
-        # Arguments above are free to choose
-        # MultiWorld can be accessed through self.multiworld, explicitly passing in
-        # MyGameWorld instance for easy options access is also a valid approach
-        return self.has("key", player)  # or whatever
+def mygame_has_key(self, state: CollectionState, player: int) -> bool:
+    # More arguments above are free to choose, since you can expect this is only called in your world
+    # MultiWorld can be accessed through state.multiworld.
+    # Explicitly passing in MyGameWorld instance for easy options access is also a valid approach, but it's generally
+    # better to check options before rule assignment since the individual functions can be called thousands of times
+    return state.has("key", player)  # or whatever
 ```
+
 ```python
 # __init__.py
 
 from worlds.generic.Rules import set_rule
-import .logic  # apply the mixin by importing its file
+from . import logic
+
 
 class MyGameWorld(World):
     # ...
     def set_rules(self) -> None:
         set_rule(self.multiworld.get_location("A Door", self.player),
-                 lambda state: state.mygame_has_key(self.player))
+                 lambda state: logic.mygame_has_key(state, self.player))
+```
+
+### Logic Mixin
+
+While lambdas and events can do pretty much anything, more complex logic can be handled in logic mixins.
+
+When importing a file that defines a class that inherits from `worlds.AutoWorld.LogicMixin`, the `CollectionState` class
+is automatically extended by the mixin's members. These members should be prefixed with the name of the implementing
+world since the namespace is shared with all other logic mixins.
+
+Some uses could be to add additional variables to the state object, or to have a custom state machine that gets modified
+with the state.
+Please do this with caution and only when necessary.
+
+#### pre_fill
+
+```python
+def pre_fill(self) -> None:
+    # place item Herb into location Chest1 for some reason
+    item = self.create_item("Herb")
+    self.multiworld.get_location("Chest1", self.player).place_locked_item(item)
+    # in most cases it's better to do this at the same time the itempool is
+    # filled to avoid accidental duplicates, such as manually placed and still in the itempool
 ```
 
 ### Generate Output
@@ -792,9 +705,9 @@ from .mod import generate_mod
 
 
 def generate_output(self, output_directory: str) -> None:
-    # How to generate the mod or ROM highly depends on the game
-    # if the mod is written in Lua, Jinja can be used to fill a template
-    # if the mod reads a json file, `json.dump()` can be used to generate that
+    # How to generate the mod or ROM highly depends on the game.
+    # If the mod is written in Lua, Jinja can be used to fill a template.
+    # If the mod reads a json file, `json.dump()` can be used to generate that.
     # code below is a dummy
     data = {
         "seed": self.multiworld.seed_name,  # to verify the server's multiworld
@@ -804,8 +717,7 @@ def generate_output(self, output_directory: str) -> None:
                   for location in self.multiworld.get_filled_locations(self.player)},
         # store start_inventory from player's .yaml
         # make sure to mark as not remote_start_inventory when connecting if stored in rom/mod
-        "starter_items": [item.name for item
-                          in self.multiworld.precollected_items[self.player]],
+        "starter_items": [item.name for item in self.multiworld.precollected_items[self.player]],
     }
 
     # add needed option results to the dictionary
@@ -824,20 +736,20 @@ def generate_output(self, output_directory: str) -> None:
 ### Slot Data
 
 If the game client needs to know information about the generated seed, a preferred method of transferring the data
-is through the slot data. This can be filled from the `fill_slot_data` method of your world by returning a `Dict[str, Any]`,
-but should be limited to data that is absolutely necessary to not waste resources. Slot data is sent to your client once
-it has successfully [connected](network%20protocol.md#connected).
-If you need to know information about locations in your world, instead
-of propagating the slot data, it is preferable to use [LocationScouts](network%20protocol.md#locationscouts) since that
-data already exists on the server. The most common usage of slot data is to send option results that the client needs
-to be aware of.
+is through the slot data. This is filled with the `fill_slot_data` method of your world by returning
+a `Dict[str, Any]`, but, to not waste resources, should be limited to data that is absolutely necessary. Slot data is
+sent to your client once it has successfully [connected](network%20protocol.md#connected).
+If you need to know information about locations in your world, instead of propagating the slot data, it is preferable
+to use [LocationScouts](network%20protocol.md#locationscouts), since that data already exists on the server. The most
+common usage of slot data is sending option results that the client needs to be aware of.
 
 ```python
 def fill_slot_data(self) -> Dict[str, Any]:
-    # in order for our game client to handle the generated seed correctly we need to know what the user selected
-    # for their difficulty and final boss HP
-    # a dictionary returned from this method gets set as the slot_data and will be sent to the client after connecting
-    # the options dataclass has a method to return a `Dict[str, Any]` of each option name provided and the option's value
+    # In order for our game client to handle the generated seed correctly we need to know what the user selected
+    # for their difficulty and final boss HP.
+    # A dictionary returned from this method gets set as the slot_data and will be sent to the client after connecting.
+    # The options dataclass has a method to return a `Dict[str, Any]` of each option name provided and the relevant
+    # option's value.
     return self.options.as_dict("difficulty", "final_boss_hp")
 ```
 
@@ -847,15 +759,17 @@ Each world implementation should have a tutorial and a game info page. These are
 the `.md` files in your world's `/docs` directory.
 
 #### Game Info
+
 The game info page is for a short breakdown of what your game is and how it works in Archipelago. Any additional
 information that may be useful to the player when learning your randomizer should also go here. The file name format
 is `<language key>_<game name>.md`. While you can write these docs for multiple languages, currently only the english
 version is displayed on the website.
 
 #### Tutorials
+
 Your game can have as many tutorials in as many languages as you like, with each one having a relevant `Tutorial`
-defined in the `WebWorld`. The file name you use aren't particularly important, but it should be descriptive of what
-the tutorial is covering, and the name of the file must match the relative URL provided in the `Tutorial`. Currently,
+defined in the `WebWorld`. The file name you use isn't particularly important, but it should be descriptive of what
+the tutorial covers, and the name of the file must match the relative URL provided in the `Tutorial`. Currently,
 the JS that determines this ignores the provided file name and will search for `game/document_lang.md`, where
 `game/document/lang` is the provided URL.
 
@@ -874,12 +788,13 @@ from test.bases import WorldTestBase
 
 
 class MyGameTestBase(WorldTestBase):
-  game = "My Game"
+    game = "My Game"
 ```
 
-Next using the rules defined in the above `set_rules` we can test that the chests have the correct access rules.
+Next, using the rules defined in the above `set_rules` we can test that the chests have the correct access rules.
 
 Example `test_chest_access.py`
+
 ```python
 from . import MyGameTestBase
 
@@ -889,15 +804,15 @@ class TestChestAccess(MyGameTestBase):
         """Test locations that require a sword"""
         locations = ["Chest1", "Chest2"]
         items = [["Sword"]]
-        # this will test that each location can't be accessed without the "Sword", but can be accessed once obtained.
+        # this will test that each location can't be accessed without the "Sword", but can be accessed once obtained
         self.assertAccessDependency(locations, items)
 
     def test_any_weapon_chests(self) -> None:
         """Test locations that require any weapon"""
         locations = [f"Chest{i}" for i in range(3, 6)]
         items = [["Sword"], ["Axe"], ["Spear"]]
-        # this will test that chests 3-5 can't be accessed without any weapon, but can be with just one of them.
+        # this will test that chests 3-5 can't be accessed without any weapon, but can be with just one of them
         self.assertAccessDependency(locations, items)
 ```
 
-For more information on tests check the [tests doc](tests.md).
+For more information on tests, check the [tests doc](tests.md).
diff --git a/playerSettings.yaml b/playerSettings.yaml
index f9585da246b8..b6b474a9fffa 100644
--- a/playerSettings.yaml
+++ b/playerSettings.yaml
@@ -26,7 +26,7 @@ name: YourName{number} # Your name in-game. Spaces will be replaced with undersc
 game: # Pick a game to play
   A Link to the Past: 1
 requires:
-  version: 0.4.3 # Version of Archipelago required for this yaml to work as expected.
+  version: 0.4.4 # Version of Archipelago required for this yaml to work as expected.
 A Link to the Past:
   progression_balancing:
     # A system that can move progression earlier, to try and prevent the player from getting stuck and bored early.
diff --git a/test/benchmark/__init__.py b/test/benchmark/__init__.py
index 5f890e85300d..6c80c60b89d7 100644
--- a/test/benchmark/__init__.py
+++ b/test/benchmark/__init__.py
@@ -1,127 +1,7 @@
-import time
-
-
-class TimeIt:
-    def __init__(self, name: str, time_logger=None):
-        self.name = name
-        self.logger = time_logger
-        self.timer = None
-        self.end_timer = None
-
-    def __enter__(self):
-        self.timer = time.perf_counter()
-        return self
-
-    @property
-    def dif(self):
-        return self.end_timer - self.timer
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if not self.end_timer:
-            self.end_timer = time.perf_counter()
-        if self.logger:
-            self.logger.info(f"{self.dif:.4f} seconds in {self.name}.")
-
-
 if __name__ == "__main__":
-    import argparse
-    import logging
-    import gc
-    import collections
-    import typing
-
-    # makes this module runnable from its folder.
-    import sys
-    import os
-    sys.path.remove(os.path.dirname(__file__))
-    new_home = os.path.normpath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
-    os.chdir(new_home)
-    sys.path.append(new_home)
-
-    from Utils import init_logging, local_path
-    local_path.cached_path = new_home
-    from BaseClasses import MultiWorld, CollectionState, Location
-    from worlds import AutoWorld
-    from worlds.AutoWorld import call_all
-
-    init_logging("Benchmark Runner")
-    logger = logging.getLogger("Benchmark")
-
-
-    class BenchmarkRunner:
-        gen_steps: typing.Tuple[str, ...] = (
-            "generate_early", "create_regions", "create_items", "set_rules", "generate_basic", "pre_fill")
-        rule_iterations: int = 100_000
-
-        if sys.version_info >= (3, 9):
-            @staticmethod
-            def format_times_from_counter(counter: collections.Counter[str], top: int = 5) -> str:
-                return "\n".join(f"  {time:.4f} in {name}" for name, time in counter.most_common(top))
-        else:
-            @staticmethod
-            def format_times_from_counter(counter: collections.Counter, top: int = 5) -> str:
-                return "\n".join(f"  {time:.4f} in {name}" for name, time in counter.most_common(top))
-
-        def location_test(self, test_location: Location, state: CollectionState, state_name: str) -> float:
-            with TimeIt(f"{test_location.game} {self.rule_iterations} "
-                        f"runs of {test_location}.access_rule({state_name})", logger) as t:
-                for _ in range(self.rule_iterations):
-                    test_location.access_rule(state)
-                # if time is taken to disentangle complex ref chains,
-                # this time should be attributed to the rule.
-                gc.collect()
-            return t.dif
-
-        def main(self):
-            for game in sorted(AutoWorld.AutoWorldRegister.world_types):
-                summary_data: typing.Dict[str, collections.Counter[str]] = {
-                    "empty_state": collections.Counter(),
-                    "all_state": collections.Counter(),
-                }
-                try:
-                    multiworld = MultiWorld(1)
-                    multiworld.game[1] = game
-                    multiworld.player_name = {1: "Tester"}
-                    multiworld.set_seed(0)
-                    multiworld.state = CollectionState(multiworld)
-                    args = argparse.Namespace()
-                    for name, option in AutoWorld.AutoWorldRegister.world_types[game].options_dataclass.type_hints.items():
-                        setattr(args, name, {
-                            1: option.from_any(getattr(option, "default"))
-                        })
-                    multiworld.set_options(args)
-
-                    gc.collect()
-                    for step in self.gen_steps:
-                        with TimeIt(f"{game} step {step}", logger):
-                            call_all(multiworld, step)
-                            gc.collect()
-
-                    locations = sorted(multiworld.get_unfilled_locations())
-                    if not locations:
-                        continue
-
-                    all_state = multiworld.get_all_state(False)
-                    for location in locations:
-                        time_taken = self.location_test(location, multiworld.state, "empty_state")
-                        summary_data["empty_state"][location.name] = time_taken
-
-                        time_taken = self.location_test(location, all_state, "all_state")
-                        summary_data["all_state"][location.name] = time_taken
-
-                    total_empty_state = sum(summary_data["empty_state"].values())
-                    total_all_state = sum(summary_data["all_state"].values())
-
-                    logger.info(f"{game} took {total_empty_state/len(locations):.4f} "
-                                f"seconds per location in empty_state and {total_all_state/len(locations):.4f} "
-                                f"in all_state. (all times summed for {self.rule_iterations} runs.)")
-                    logger.info(f"Top times in empty_state:\n"
-                                f"{self.format_times_from_counter(summary_data['empty_state'])}")
-                    logger.info(f"Top times in all_state:\n"
-                                f"{self.format_times_from_counter(summary_data['all_state'])}")
-
-                except Exception as e:
-                    logger.exception(e)
-
-    runner = BenchmarkRunner()
-    runner.main()
+    import path_change
+    path_change.change_home()
+    import load_worlds
+    load_worlds.run_load_worlds_benchmark()
+    import locations
+    locations.run_locations_benchmark()
diff --git a/test/benchmark/load_worlds.py b/test/benchmark/load_worlds.py
new file mode 100644
index 000000000000..3b001699f4cb
--- /dev/null
+++ b/test/benchmark/load_worlds.py
@@ -0,0 +1,27 @@
+def run_load_worlds_benchmark():
+    """List worlds and their load time.
+    Note that any first-time imports will be attributed to that world, as it is cached afterwards.
+    Likely best used with isolated worlds to measure their time alone."""
+    import logging
+
+    from Utils import init_logging
+
+    # get some general imports cached, to prevent it from being attributed to one world.
+    import orjson
+    orjson.loads("{}")  # orjson runs initialization on first use
+
+    import BaseClasses, Launcher, Fill
+
+    from worlds import world_sources
+
+    init_logging("Benchmark Runner")
+    logger = logging.getLogger("Benchmark")
+
+    for module in world_sources:
+        logger.info(f"{module} took {module.time_taken:.4f} seconds.")
+
+
+if __name__ == "__main__":
+    from path_change import change_home
+    change_home()
+    run_load_worlds_benchmark()
diff --git a/test/benchmark/locations.py b/test/benchmark/locations.py
new file mode 100644
index 000000000000..f2209eb689e1
--- /dev/null
+++ b/test/benchmark/locations.py
@@ -0,0 +1,101 @@
+def run_locations_benchmark():
+    import argparse
+    import logging
+    import gc
+    import collections
+    import typing
+    import sys
+
+    from time_it import TimeIt
+
+    from Utils import init_logging
+    from BaseClasses import MultiWorld, CollectionState, Location
+    from worlds import AutoWorld
+    from worlds.AutoWorld import call_all
+
+    init_logging("Benchmark Runner")
+    logger = logging.getLogger("Benchmark")
+
+    class BenchmarkRunner:
+        gen_steps: typing.Tuple[str, ...] = (
+            "generate_early", "create_regions", "create_items", "set_rules", "generate_basic", "pre_fill")
+        rule_iterations: int = 100_000
+
+        if sys.version_info >= (3, 9):
+            @staticmethod
+            def format_times_from_counter(counter: collections.Counter[str], top: int = 5) -> str:
+                return "\n".join(f"  {time:.4f} in {name}" for name, time in counter.most_common(top))
+        else:
+            @staticmethod
+            def format_times_from_counter(counter: collections.Counter, top: int = 5) -> str:
+                return "\n".join(f"  {time:.4f} in {name}" for name, time in counter.most_common(top))
+
+        def location_test(self, test_location: Location, state: CollectionState, state_name: str) -> float:
+            with TimeIt(f"{test_location.game} {self.rule_iterations} "
+                        f"runs of {test_location}.access_rule({state_name})", logger) as t:
+                for _ in range(self.rule_iterations):
+                    test_location.access_rule(state)
+                # if time is taken to disentangle complex ref chains,
+                # this time should be attributed to the rule.
+                gc.collect()
+            return t.dif
+
+        def main(self):
+            for game in sorted(AutoWorld.AutoWorldRegister.world_types):
+                summary_data: typing.Dict[str, collections.Counter[str]] = {
+                    "empty_state": collections.Counter(),
+                    "all_state": collections.Counter(),
+                }
+                try:
+                    multiworld = MultiWorld(1)
+                    multiworld.game[1] = game
+                    multiworld.player_name = {1: "Tester"}
+                    multiworld.set_seed(0)
+                    multiworld.state = CollectionState(multiworld)
+                    args = argparse.Namespace()
+                    for name, option in AutoWorld.AutoWorldRegister.world_types[game].options_dataclass.type_hints.items():
+                        setattr(args, name, {
+                            1: option.from_any(getattr(option, "default"))
+                        })
+                    multiworld.set_options(args)
+
+                    gc.collect()
+                    for step in self.gen_steps:
+                        with TimeIt(f"{game} step {step}", logger):
+                            call_all(multiworld, step)
+                            gc.collect()
+
+                    locations = sorted(multiworld.get_unfilled_locations())
+                    if not locations:
+                        continue
+
+                    all_state = multiworld.get_all_state(False)
+                    for location in locations:
+                        time_taken = self.location_test(location, multiworld.state, "empty_state")
+                        summary_data["empty_state"][location.name] = time_taken
+
+                        time_taken = self.location_test(location, all_state, "all_state")
+                        summary_data["all_state"][location.name] = time_taken
+
+                    total_empty_state = sum(summary_data["empty_state"].values())
+                    total_all_state = sum(summary_data["all_state"].values())
+
+                    logger.info(f"{game} took {total_empty_state/len(locations):.4f} "
+                                f"seconds per location in empty_state and {total_all_state/len(locations):.4f} "
+                                f"in all_state. (all times summed for {self.rule_iterations} runs.)")
+                    logger.info(f"Top times in empty_state:\n"
+                                f"{self.format_times_from_counter(summary_data['empty_state'])}")
+                    logger.info(f"Top times in all_state:\n"
+                                f"{self.format_times_from_counter(summary_data['all_state'])}")
+
+                except Exception as e:
+                    logger.exception(e)
+
+    runner = BenchmarkRunner()
+    runner.main()
+
+
+if __name__ == "__main__":
+    from path_change import change_home
+    change_home()
+    run_locations_benchmark()
diff --git a/test/benchmark/path_change.py b/test/benchmark/path_change.py
new file mode 100644
index 000000000000..2baa6273e11e
--- /dev/null
+++ b/test/benchmark/path_change.py
@@ -0,0 +1,16 @@
+import sys
+import os
+
+
+def change_home():
+    """Allow scripts to run from "this" folder."""
+    old_home = os.path.dirname(__file__)
+    sys.path.remove(old_home)
+    new_home = os.path.normpath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
+    os.chdir(new_home)
+    sys.path.append(new_home)
+    # fallback to local import
+    sys.path.append(old_home)
+
+    from Utils import local_path
+    local_path.cached_path = new_home
diff --git a/test/benchmark/time_it.py b/test/benchmark/time_it.py
new file mode 100644
index 000000000000..95c0314682f6
--- /dev/null
+++ b/test/benchmark/time_it.py
@@ -0,0 +1,23 @@
+import time
+
+
+class TimeIt:
+    def __init__(self, name: str, time_logger=None):
+        self.name = name
+        self.logger = time_logger
+        self.timer = None
+        self.end_timer = None
+
+    def __enter__(self):
+        self.timer = time.perf_counter()
+        return self
+
+    @property
+    def dif(self):
+        return self.end_timer - self.timer
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if not self.end_timer:
+            self.end_timer = time.perf_counter()
+        if self.logger:
+            self.logger.info(f"{self.dif:.4f} seconds in {self.name}.")
diff --git a/test/general/test_fill.py b/test/general/test_fill.py
index e454b3e61d7a..489417771d2a 100644
--- a/test/general/test_fill.py
+++ b/test/general/test_fill.py
@@ -11,30 +11,30 @@
 from worlds.generic.Rules import CollectionRule, add_item_rule, locality_rules, set_rule
 
 
-def generate_multi_world(players: int = 1) -> MultiWorld:
-    multi_world = MultiWorld(players)
-    multi_world.player_name = {}
-    multi_world.state = CollectionState(multi_world)
+def generate_multiworld(players: int = 1) -> MultiWorld:
+    multiworld = MultiWorld(players)
+    multiworld.player_name = {}
+    multiworld.state = CollectionState(multiworld)
     for i in range(players):
         player_id = i+1
-        world = World(multi_world, player_id)
-        multi_world.game[player_id] = f"Game {player_id}"
-        multi_world.worlds[player_id] = world
-        multi_world.player_name[player_id] = "Test Player " + str(player_id)
-        region = Region("Menu", player_id, multi_world, "Menu Region Hint")
-        multi_world.regions.append(region)
+        world = World(multiworld, player_id)
+        multiworld.game[player_id] = f"Game {player_id}"
+        multiworld.worlds[player_id] = world
+        multiworld.player_name[player_id] = "Test Player " + str(player_id)
+        region = Region("Menu", player_id, multiworld, "Menu Region Hint")
+        multiworld.regions.append(region)
         for option_key, option in Options.PerGameCommonOptions.type_hints.items():
-            if hasattr(multi_world, option_key):
-                getattr(multi_world, option_key).setdefault(player_id, option.from_any(getattr(option, "default")))
+            if hasattr(multiworld, option_key):
+                getattr(multiworld, option_key).setdefault(player_id, option.from_any(getattr(option, "default")))
             else:
-                setattr(multi_world, option_key, {player_id: option.from_any(getattr(option, "default"))})
+                setattr(multiworld, option_key, {player_id: option.from_any(getattr(option, "default"))})
         # TODO - remove this loop once all worlds use options dataclasses
-        world.options = world.options_dataclass(**{option_key: getattr(multi_world, option_key)[player_id]
+        world.options = world.options_dataclass(**{option_key: getattr(multiworld, option_key)[player_id]
                                                    for option_key in world.options_dataclass.type_hints})
 
-    multi_world.set_seed(0)
+    multiworld.set_seed(0)
 
-    return multi_world
+    return multiworld
 
 
 class PlayerDefinition(object):
@@ -46,8 +46,8 @@ class PlayerDefinition(object):
     basic_items: List[Item]
     regions: List[Region]
 
-    def __init__(self, world: MultiWorld, id: int, menu: Region, locations: List[Location] = [], prog_items: List[Item] = [], basic_items: List[Item] = []):
-        self.multiworld = world
+    def __init__(self, multiworld: MultiWorld, id: int, menu: Region, locations: List[Location] = [], prog_items: List[Item] = [], basic_items: List[Item] = []):
+        self.multiworld = multiworld
         self.id = id
         self.menu = menu
         self.locations = locations
@@ -72,7 +72,7 @@ def generate_region(self, parent: Region, size: int, access_rule: CollectionRule
         return region
 
 
-def fill_region(world: MultiWorld, region: Region, items: List[Item]) -> List[Item]:
+def fill_region(multiworld: MultiWorld, region: Region, items: List[Item]) -> List[Item]:
     items = items.copy()
     while len(items) > 0:
         location = region.locations.pop(0)
@@ -80,7 +80,7 @@ def fill_region(world: MultiWorld, region: Region, items: List[Item]) -> List[It
         if location.item:
             return items
         item = items.pop(0)
-        world.push_item(location, item, False)
+        multiworld.push_item(location, item, False)
         location.event = item.advancement
 
     return items
@@ -94,15 +94,15 @@ def region_contains(region: Region, item: Item) -> bool:
     return False
 
 
-def generate_player_data(multi_world: MultiWorld, player_id: int, location_count: int = 0, prog_item_count: int = 0, basic_item_count: int = 0) -> PlayerDefinition:
-    menu = multi_world.get_region("Menu", player_id)
+def generate_player_data(multiworld: MultiWorld, player_id: int, location_count: int = 0, prog_item_count: int = 0, basic_item_count: int = 0) -> PlayerDefinition:
+    menu = multiworld.get_region("Menu", player_id)
     locations = generate_locations(location_count, player_id, None, menu)
     prog_items = generate_items(prog_item_count, player_id, True)
-    multi_world.itempool += prog_items
+    multiworld.itempool += prog_items
     basic_items = generate_items(basic_item_count, player_id, False)
-    multi_world.itempool += basic_items
+    multiworld.itempool += basic_items
 
-    return PlayerDefinition(multi_world, player_id, menu, locations, prog_items, basic_items)
+    return PlayerDefinition(multiworld, player_id, menu, locations, prog_items, basic_items)
 
 
 def generate_locations(count: int, player_id: int, address: int = None, region: Region = None, tag: str = "") -> List[Location]:
@@ -134,15 +134,15 @@ def names(objs: list) -> Iterable[str]:
 class TestFillRestrictive(unittest.TestCase):
     def test_basic_fill(self):
         """Tests `fill_restrictive` fills and removes the locations and items from their respective lists"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 2, 2)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 2, 2)
 
         item0 = player1.prog_items[0]
         item1 = player1.prog_items[1]
         loc0 = player1.locations[0]
         loc1 = player1.locations[1]
 
-        fill_restrictive(multi_world, multi_world.state,
+        fill_restrictive(multiworld, multiworld.state,
                          player1.locations, player1.prog_items)
 
         self.assertEqual(loc0.item, item1)
@@ -152,16 +152,16 @@ def test_basic_fill(self):
 
     def test_ordered_fill(self):
         """Tests `fill_restrictive` fulfills set rules"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 2, 2)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 2, 2)
         items = player1.prog_items
         locations = player1.locations
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             items[0].name, player1.id) and state.has(items[1].name, player1.id)
         set_rule(locations[1], lambda state: state.has(
             items[0].name, player1.id))
-        fill_restrictive(multi_world, multi_world.state,
+        fill_restrictive(multiworld, multiworld.state,
                          player1.locations.copy(), player1.prog_items.copy())
 
         self.assertEqual(locations[0].item, items[0])
@@ -169,8 +169,8 @@ def test_ordered_fill(self):
 
     def test_partial_fill(self):
         """Tests that `fill_restrictive` returns unfilled locations"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 3, 2)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 3, 2)
 
         item0 = player1.prog_items[0]
         item1 = player1.prog_items[1]
@@ -178,14 +178,14 @@ def test_partial_fill(self):
         loc1 = player1.locations[1]
         loc2 = player1.locations[2]
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             item0.name, player1.id) and state.has(item1.name, player1.id)
         set_rule(loc1, lambda state: state.has(
             item0.name, player1.id))
         # forces a swap
         set_rule(loc2, lambda state: state.has(
             item0.name, player1.id))
-        fill_restrictive(multi_world, multi_world.state,
+        fill_restrictive(multiworld, multiworld.state,
                          player1.locations, player1.prog_items)
 
         self.assertEqual(loc0.item, item0)
@@ -195,19 +195,19 @@ def test_partial_fill(self):
 
     def test_minimal_fill(self):
         """Test that fill for minimal player can have unreachable items"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 2, 2)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 2, 2)
 
         items = player1.prog_items
         locations = player1.locations
 
-        multi_world.worlds[player1.id].options.accessibility = Accessibility.from_any(Accessibility.option_minimal)
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.worlds[player1.id].options.accessibility = Accessibility.from_any(Accessibility.option_minimal)
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             items[1].name, player1.id)
         set_rule(locations[1], lambda state: state.has(
             items[0].name, player1.id))
 
-        fill_restrictive(multi_world, multi_world.state,
+        fill_restrictive(multiworld, multiworld.state,
                          player1.locations.copy(), player1.prog_items.copy())
 
         self.assertEqual(locations[0].item, items[1])
@@ -220,15 +220,15 @@ def test_minimal_mixed_fill(self):
         the non-minimal player get all items.
         """
 
-        multi_world = generate_multi_world(2)
-        player1 = generate_player_data(multi_world, 1, 3, 3)
-        player2 = generate_player_data(multi_world, 2, 3, 3)
+        multiworld = generate_multiworld(2)
+        player1 = generate_player_data(multiworld, 1, 3, 3)
+        player2 = generate_player_data(multiworld, 2, 3, 3)
 
-        multi_world.accessibility[player1.id].value = multi_world.accessibility[player1.id].option_minimal
-        multi_world.accessibility[player2.id].value = multi_world.accessibility[player2.id].option_locations
+        multiworld.accessibility[player1.id].value = multiworld.accessibility[player1.id].option_minimal
+        multiworld.accessibility[player2.id].value = multiworld.accessibility[player2.id].option_locations
 
-        multi_world.completion_condition[player1.id] = lambda state: True
-        multi_world.completion_condition[player2.id] = lambda state: state.has(player2.prog_items[2].name, player2.id)
+        multiworld.completion_condition[player1.id] = lambda state: True
+        multiworld.completion_condition[player2.id] = lambda state: state.has(player2.prog_items[2].name, player2.id)
 
         set_rule(player1.locations[1], lambda state: state.has(player1.prog_items[0].name, player1.id))
         set_rule(player1.locations[2], lambda state: state.has(player1.prog_items[1].name, player1.id))
@@ -241,28 +241,28 @@ def test_minimal_mixed_fill(self):
         # fill remaining locations with remaining items
         location_pool = player1.locations[1:] + player2.locations
         item_pool = player1.prog_items[:-1] + player2.prog_items
-        fill_restrictive(multi_world, multi_world.state, location_pool, item_pool)
-        multi_world.state.sweep_for_events()  # collect everything
+        fill_restrictive(multiworld, multiworld.state, location_pool, item_pool)
+        multiworld.state.sweep_for_events()  # collect everything
 
         # all of player2's locations and items should be accessible (not all of player1's)
         for item in player2.prog_items:
-            self.assertTrue(multi_world.state.has(item.name, player2.id),
+            self.assertTrue(multiworld.state.has(item.name, player2.id),
                             f'{item} is unreachable in {item.location}')
 
     def test_reversed_fill(self):
         """Test a different set of rules can be satisfied"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 2, 2)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 2, 2)
 
         item0 = player1.prog_items[0]
         item1 = player1.prog_items[1]
         loc0 = player1.locations[0]
         loc1 = player1.locations[1]
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             item0.name, player1.id) and state.has(item1.name, player1.id)
         set_rule(loc1, lambda state: state.has(item1.name, player1.id))
-        fill_restrictive(multi_world, multi_world.state,
+        fill_restrictive(multiworld, multiworld.state,
                          player1.locations, player1.prog_items)
 
         self.assertEqual(loc0.item, item1)
@@ -270,13 +270,13 @@ def test_reversed_fill(self):
 
     def test_multi_step_fill(self):
         """Test that fill is able to satisfy multiple spheres"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 4, 4)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 4, 4)
 
         items = player1.prog_items
         locations = player1.locations
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             items[2].name, player1.id) and state.has(items[3].name, player1.id)
         set_rule(locations[1], lambda state: state.has(
             items[0].name, player1.id))
@@ -285,7 +285,7 @@ def test_multi_step_fill(self):
         set_rule(locations[3], lambda state: state.has(
             items[1].name, player1.id))
 
-        fill_restrictive(multi_world, multi_world.state,
+        fill_restrictive(multiworld, multiworld.state,
                          player1.locations.copy(), player1.prog_items.copy())
 
         self.assertEqual(locations[0].item, items[1])
@@ -295,25 +295,25 @@ def test_multi_step_fill(self):
 
     def test_impossible_fill(self):
         """Test that fill raises an error when it can't place any items"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 2, 2)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 2, 2)
         items = player1.prog_items
         locations = player1.locations
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             items[0].name, player1.id) and state.has(items[1].name, player1.id)
         set_rule(locations[1], lambda state: state.has(
             items[1].name, player1.id))
         set_rule(locations[0], lambda state: state.has(
             items[0].name, player1.id))
 
-        self.assertRaises(FillError, fill_restrictive, multi_world, multi_world.state,
+        self.assertRaises(FillError, fill_restrictive, multiworld, multiworld.state,
                           player1.locations.copy(), player1.prog_items.copy())
 
     def test_circular_fill(self):
         """Test that fill raises an error when it can't place all items"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 3, 3)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 3, 3)
 
         item0 = player1.prog_items[0]
         item1 = player1.prog_items[1]
@@ -322,46 +322,46 @@ def test_circular_fill(self):
         loc1 = player1.locations[1]
         loc2 = player1.locations[2]
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             item0.name, player1.id) and state.has(item1.name, player1.id) and state.has(item2.name, player1.id)
         set_rule(loc1, lambda state: state.has(item0.name, player1.id))
         set_rule(loc2, lambda state: state.has(item1.name, player1.id))
         set_rule(loc0, lambda state: state.has(item2.name, player1.id))
 
-        self.assertRaises(FillError, fill_restrictive, multi_world, multi_world.state,
+        self.assertRaises(FillError, fill_restrictive, multiworld, multiworld.state,
                           player1.locations.copy(), player1.prog_items.copy())
 
     def test_competing_fill(self):
         """Test that fill raises an error when it can't place items in a way to satisfy the conditions"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 2, 2)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 2, 2)
 
         item0 = player1.prog_items[0]
         item1 = player1.prog_items[1]
         loc1 = player1.locations[1]
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             item0.name, player1.id) and state.has(item0.name, player1.id) and state.has(item1.name, player1.id)
         set_rule(loc1, lambda state: state.has(item0.name, player1.id)
                  and state.has(item1.name, player1.id))
 
-        self.assertRaises(FillError, fill_restrictive, multi_world, multi_world.state,
+        self.assertRaises(FillError, fill_restrictive, multiworld, multiworld.state,
                           player1.locations.copy(), player1.prog_items.copy())
 
     def test_multiplayer_fill(self):
         """Test that items can be placed across worlds"""
-        multi_world = generate_multi_world(2)
-        player1 = generate_player_data(multi_world, 1, 2, 2)
-        player2 = generate_player_data(multi_world, 2, 2, 2)
+        multiworld = generate_multiworld(2)
+        player1 = generate_player_data(multiworld, 1, 2, 2)
+        player2 = generate_player_data(multiworld, 2, 2, 2)
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             player1.prog_items[0].name, player1.id) and state.has(
             player1.prog_items[1].name, player1.id)
-        multi_world.completion_condition[player2.id] = lambda state: state.has(
+        multiworld.completion_condition[player2.id] = lambda state: state.has(
             player2.prog_items[0].name, player2.id) and state.has(
             player2.prog_items[1].name, player2.id)
 
-        fill_restrictive(multi_world, multi_world.state, player1.locations +
+        fill_restrictive(multiworld, multiworld.state, player1.locations +
                          player2.locations, player1.prog_items + player2.prog_items)
 
         self.assertEqual(player1.locations[0].item, player1.prog_items[1])
@@ -371,21 +371,21 @@ def test_multiplayer_fill(self):
 
     def test_multiplayer_rules_fill(self):
         """Test that fill across worlds satisfies the rules"""
-        multi_world = generate_multi_world(2)
-        player1 = generate_player_data(multi_world, 1, 2, 2)
-        player2 = generate_player_data(multi_world, 2, 2, 2)
+        multiworld = generate_multiworld(2)
+        player1 = generate_player_data(multiworld, 1, 2, 2)
+        player2 = generate_player_data(multiworld, 2, 2, 2)
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             player1.prog_items[0].name, player1.id) and state.has(
             player1.prog_items[1].name, player1.id)
-        multi_world.completion_condition[player2.id] = lambda state: state.has(
+        multiworld.completion_condition[player2.id] = lambda state: state.has(
             player2.prog_items[0].name, player2.id) and state.has(
             player2.prog_items[1].name, player2.id)
 
         set_rule(player2.locations[1], lambda state: state.has(
             player2.prog_items[0].name, player2.id))
 
-        fill_restrictive(multi_world, multi_world.state, player1.locations +
+        fill_restrictive(multiworld, multiworld.state, player1.locations +
                          player2.locations, player1.prog_items + player2.prog_items)
 
         self.assertEqual(player1.locations[0].item, player2.prog_items[0])
@@ -395,10 +395,10 @@ def test_multiplayer_rules_fill(self):
 
     def test_restrictive_progress(self):
         """Test that various spheres with different requirements can be filled"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, prog_item_count=25)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, prog_item_count=25)
         items = player1.prog_items.copy()
-        multi_world.completion_condition[player1.id] = lambda state: state.has_all(
+        multiworld.completion_condition[player1.id] = lambda state: state.has_all(
             names(player1.prog_items), player1.id)
 
         player1.generate_region(player1.menu, 5)
@@ -411,16 +411,16 @@ def test_restrictive_progress(self):
         player1.generate_region(player1.menu, 5, lambda state: state.has_all(
             names(items[17:22]), player1.id))
 
-        locations = multi_world.get_unfilled_locations()
+        locations = multiworld.get_unfilled_locations()
 
-        fill_restrictive(multi_world, multi_world.state,
+        fill_restrictive(multiworld, multiworld.state,
                          locations, player1.prog_items)
 
     def test_swap_to_earlier_location_with_item_rule(self):
         """Test that item swap happens and works as intended"""
         # test for PR#1109
-        multi_world = generate_multi_world(1)
-        player1 = generate_player_data(multi_world, 1, 4, 4)
+        multiworld = generate_multiworld(1)
+        player1 = generate_player_data(multiworld, 1, 4, 4)
         locations = player1.locations[:]  # copy required
         items = player1.prog_items[:]  # copy required
         # for the test to work, item and location order is relevant: Sphere 1 last, allowed_item not last
@@ -437,15 +437,15 @@ def test_swap_to_earlier_location_with_item_rule(self):
         self.assertTrue(sphere1_loc.can_fill(None, allowed_item, False), "Test is flawed")
         self.assertFalse(sphere1_loc.can_fill(None, items[2], False), "Test is flawed")
         # fill has to place items[1] in locations[0] which will result in a swap because of placement order
-        fill_restrictive(multi_world, multi_world.state, player1.locations, player1.prog_items)
+        fill_restrictive(multiworld, multiworld.state, player1.locations, player1.prog_items)
         # assert swap happened
         self.assertTrue(sphere1_loc.item, "Did not swap required item into Sphere 1")
         self.assertEqual(sphere1_loc.item, allowed_item, "Wrong item in Sphere 1")
 
     def test_swap_to_earlier_location_with_item_rule2(self):
         """Test that swap works before all items are placed"""
-        multi_world = generate_multi_world(1)
-        player1 = generate_player_data(multi_world, 1, 5, 5)
+        multiworld = generate_multiworld(1)
+        player1 = generate_player_data(multiworld, 1, 5, 5)
         locations = player1.locations[:]  # copy required
         items = player1.prog_items[:]  # copy required
         # Two items provide access to sphere 2.
@@ -477,7 +477,7 @@ def test_swap_to_earlier_location_with_item_rule2(self):
 
         # Now fill should place one_to_two1 in sphere1_loc1 or sphere1_loc2 via swap,
         # which it will attempt before two_to_three and three_to_four are placed, testing the behavior.
-        fill_restrictive(multi_world, multi_world.state, player1.locations, player1.prog_items)
+        fill_restrictive(multiworld, multiworld.state, player1.locations, player1.prog_items)
         # assert swap happened
         self.assertTrue(sphere1_loc1.item and sphere1_loc2.item, "Did not swap required item into Sphere 1")
         self.assertTrue(sphere1_loc1.item.name == one_to_two1 or
@@ -486,29 +486,29 @@ def test_swap_to_earlier_location_with_item_rule2(self):
     def test_double_sweep(self):
         """Test that sweep doesn't duplicate Event items when sweeping"""
         # test for PR1114
-        multi_world = generate_multi_world(1)
-        player1 = generate_player_data(multi_world, 1, 1, 1)
+        multiworld = generate_multiworld(1)
+        player1 = generate_player_data(multiworld, 1, 1, 1)
         location = player1.locations[0]
         location.address = None
         location.event = True
         item = player1.prog_items[0]
         item.code = None
         location.place_locked_item(item)
-        multi_world.state.sweep_for_events()
-        multi_world.state.sweep_for_events()
-        self.assertTrue(multi_world.state.prog_items[item.player][item.name], "Sweep did not collect - Test flawed")
-        self.assertEqual(multi_world.state.prog_items[item.player][item.name], 1, "Sweep collected multiple times")
+        multiworld.state.sweep_for_events()
+        multiworld.state.sweep_for_events()
+        self.assertTrue(multiworld.state.prog_items[item.player][item.name], "Sweep did not collect - Test flawed")
+        self.assertEqual(multiworld.state.prog_items[item.player][item.name], 1, "Sweep collected multiple times")
 
     def test_correct_item_instance_removed_from_pool(self):
         """Test that a placed item gets removed from the submitted pool"""
-        multi_world = generate_multi_world()
-        player1 = generate_player_data(multi_world, 1, 2, 2)
+        multiworld = generate_multiworld()
+        player1 = generate_player_data(multiworld, 1, 2, 2)
 
         player1.prog_items[0].name = "Different_item_instance_but_same_item_name"
         player1.prog_items[1].name = "Different_item_instance_but_same_item_name"
         loc0 = player1.locations[0]
 
-        fill_restrictive(multi_world, multi_world.state,
+        fill_restrictive(multiworld, multiworld.state,
                          [loc0], player1.prog_items)
 
         self.assertEqual(1, len(player1.prog_items))
@@ -518,14 +518,14 @@ def test_correct_item_instance_removed_from_pool(self):
 class TestDistributeItemsRestrictive(unittest.TestCase):
     def test_basic_distribute(self):
         """Test that distribute_items_restrictive is deterministic"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
         locations = player1.locations
         prog_items = player1.prog_items
         basic_items = player1.basic_items
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
         self.assertEqual(locations[0].item, basic_items[1])
         self.assertFalse(locations[0].event)
@@ -538,52 +538,52 @@ def test_basic_distribute(self):
 
     def test_excluded_distribute(self):
         """Test that distribute_items_restrictive doesn't put advancement items on excluded locations"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
         locations = player1.locations
 
         locations[1].progress_type = LocationProgressType.EXCLUDED
         locations[2].progress_type = LocationProgressType.EXCLUDED
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
         self.assertFalse(locations[1].item.advancement)
         self.assertFalse(locations[2].item.advancement)
 
     def test_non_excluded_item_distribute(self):
         """Test that useful items aren't placed on excluded locations"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
         locations = player1.locations
         basic_items = player1.basic_items
 
         locations[1].progress_type = LocationProgressType.EXCLUDED
         basic_items[1].classification = ItemClassification.useful
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
         self.assertEqual(locations[1].item, basic_items[0])
 
     def test_too_many_excluded_distribute(self):
         """Test that fill fails if it can't place all progression items due to too many excluded locations"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
         locations = player1.locations
 
         locations[0].progress_type = LocationProgressType.EXCLUDED
         locations[1].progress_type = LocationProgressType.EXCLUDED
         locations[2].progress_type = LocationProgressType.EXCLUDED
 
-        self.assertRaises(FillError, distribute_items_restrictive, multi_world)
+        self.assertRaises(FillError, distribute_items_restrictive, multiworld)
 
     def test_non_excluded_item_must_distribute(self):
         """Test that fill fails if it can't place useful items due to too many excluded locations"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
         locations = player1.locations
         basic_items = player1.basic_items
 
@@ -592,47 +592,47 @@ def test_non_excluded_item_must_distribute(self):
         basic_items[0].classification = ItemClassification.useful
         basic_items[1].classification = ItemClassification.useful
 
-        self.assertRaises(FillError, distribute_items_restrictive, multi_world)
+        self.assertRaises(FillError, distribute_items_restrictive, multiworld)
 
     def test_priority_distribute(self):
         """Test that priority locations receive advancement items"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
         locations = player1.locations
 
         locations[0].progress_type = LocationProgressType.PRIORITY
         locations[3].progress_type = LocationProgressType.PRIORITY
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
         self.assertTrue(locations[0].item.advancement)
         self.assertTrue(locations[3].item.advancement)
 
     def test_excess_priority_distribute(self):
         """Test that if there's more priority locations than advancement items, they can still fill"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
         locations = player1.locations
 
         locations[0].progress_type = LocationProgressType.PRIORITY
         locations[1].progress_type = LocationProgressType.PRIORITY
         locations[2].progress_type = LocationProgressType.PRIORITY
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
         self.assertFalse(locations[3].item.advancement)
 
     def test_multiple_world_priority_distribute(self):
         """Test that priority fill can be satisfied for multiple worlds"""
-        multi_world = generate_multi_world(3)
+        multiworld = generate_multiworld(3)
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
         player2 = generate_player_data(
-            multi_world, 2, 4, prog_item_count=1, basic_item_count=3)
+            multiworld, 2, 4, prog_item_count=1, basic_item_count=3)
         player3 = generate_player_data(
-            multi_world, 3, 6, prog_item_count=4, basic_item_count=2)
+            multiworld, 3, 6, prog_item_count=4, basic_item_count=2)
 
         player1.locations[2].progress_type = LocationProgressType.PRIORITY
         player1.locations[3].progress_type = LocationProgressType.PRIORITY
@@ -644,7 +644,7 @@ def test_multiple_world_priority_distribute(self):
         player3.locations[2].progress_type = LocationProgressType.PRIORITY
         player3.locations[3].progress_type = LocationProgressType.PRIORITY
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
         self.assertTrue(player1.locations[2].item.advancement)
         self.assertTrue(player1.locations[3].item.advancement)
@@ -656,9 +656,9 @@ def test_multiple_world_priority_distribute(self):
 
     def test_can_remove_locations_in_fill_hook(self):
         """Test that distribute_items_restrictive calls the fill hook and allows for item and location removal"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, 4, prog_item_count=2, basic_item_count=2)
+            multiworld, 1, 4, prog_item_count=2, basic_item_count=2)
 
         removed_item: list[Item] = []
         removed_location: list[Location] = []
@@ -667,21 +667,21 @@ def fill_hook(progitempool, usefulitempool, filleritempool, fill_locations):
             removed_item.append(filleritempool.pop(0))
             removed_location.append(fill_locations.pop(0))
 
-        multi_world.worlds[player1.id].fill_hook = fill_hook
+        multiworld.worlds[player1.id].fill_hook = fill_hook
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
         self.assertIsNone(removed_item[0].location)
         self.assertIsNone(removed_location[0].item)
 
     def test_seed_robust_to_item_order(self):
         """Test deterministic fill"""
-        mw1 = generate_multi_world()
+        mw1 = generate_multiworld()
         gen1 = generate_player_data(
             mw1, 1, 4, prog_item_count=2, basic_item_count=2)
         distribute_items_restrictive(mw1)
 
-        mw2 = generate_multi_world()
+        mw2 = generate_multiworld()
         gen2 = generate_player_data(
             mw2, 1, 4, prog_item_count=2, basic_item_count=2)
         mw2.itempool.append(mw2.itempool.pop(0))
@@ -694,12 +694,12 @@ def test_seed_robust_to_item_order(self):
 
     def test_seed_robust_to_location_order(self):
         """Test deterministic fill even if locations in a region are reordered"""
-        mw1 = generate_multi_world()
+        mw1 = generate_multiworld()
         gen1 = generate_player_data(
             mw1, 1, 4, prog_item_count=2, basic_item_count=2)
         distribute_items_restrictive(mw1)
 
-        mw2 = generate_multi_world()
+        mw2 = generate_multiworld()
         gen2 = generate_player_data(
             mw2, 1, 4, prog_item_count=2, basic_item_count=2)
         reg = mw2.get_region("Menu", gen2.id)
@@ -713,45 +713,45 @@ def test_seed_robust_to_location_order(self):
 
     def test_can_reserve_advancement_items_for_general_fill(self):
         """Test that priority locations fill still satisfies item rules"""
-        multi_world = generate_multi_world()
+        multiworld = generate_multiworld()
         player1 = generate_player_data(
-            multi_world, 1, location_count=5, prog_item_count=5)
+            multiworld, 1, location_count=5, prog_item_count=5)
         items = player1.prog_items
-        multi_world.completion_condition[player1.id] = lambda state: state.has_all(
+        multiworld.completion_condition[player1.id] = lambda state: state.has_all(
             names(items), player1.id)
 
         location = player1.locations[0]
         location.progress_type = LocationProgressType.PRIORITY
         location.item_rule = lambda item: item not in items[:4]
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
         self.assertEqual(location.item, items[4])
 
     def test_non_excluded_local_items(self):
         """Test that local items get placed locally in a multiworld"""
-        multi_world = generate_multi_world(2)
+        multiworld = generate_multiworld(2)
         player1 = generate_player_data(
-            multi_world, 1, location_count=5, basic_item_count=5)
+            multiworld, 1, location_count=5, basic_item_count=5)
         player2 = generate_player_data(
-            multi_world, 2, location_count=5, basic_item_count=5)
+            multiworld, 2, location_count=5, basic_item_count=5)
 
-        for item in multi_world.get_items():
+        for item in multiworld.get_items():
             item.classification = ItemClassification.useful
 
-        multi_world.local_items[player1.id].value = set(names(player1.basic_items))
-        multi_world.local_items[player2.id].value = set(names(player2.basic_items))
-        locality_rules(multi_world)
+        multiworld.local_items[player1.id].value = set(names(player1.basic_items))
+        multiworld.local_items[player2.id].value = set(names(player2.basic_items))
+        locality_rules(multiworld)
 
-        distribute_items_restrictive(multi_world)
+        distribute_items_restrictive(multiworld)
 
-        for item in multi_world.get_items():
+        for item in multiworld.get_items():
             self.assertEqual(item.player, item.location.player)
             self.assertFalse(item.location.event, False)
 
     def test_early_items(self) -> None:
         """Test that the early items API successfully places items early"""
-        mw = generate_multi_world(2)
+        mw = generate_multiworld(2)
         player1 = generate_player_data(mw, 1, location_count=5, basic_item_count=5)
         player2 = generate_player_data(mw, 2, location_count=5, basic_item_count=5)
         mw.early_items[1][player1.basic_items[0].name] = 1
@@ -810,19 +810,19 @@ def assertRegionContains(self, region: Region, item: Item) -> bool:
                   "\n Contains" + str(list(map(lambda location: location.item, region.locations))))
 
     def setUp(self) -> None:
-        multi_world = generate_multi_world(2)
-        self.multi_world = multi_world
+        multiworld = generate_multiworld(2)
+        self.multiworld = multiworld
         player1 = generate_player_data(
-            multi_world, 1, prog_item_count=2, basic_item_count=40)
+            multiworld, 1, prog_item_count=2, basic_item_count=40)
         self.player1 = player1
         player2 = generate_player_data(
-            multi_world, 2, prog_item_count=2, basic_item_count=40)
+            multiworld, 2, prog_item_count=2, basic_item_count=40)
         self.player2 = player2
 
-        multi_world.completion_condition[player1.id] = lambda state: state.has(
+        multiworld.completion_condition[player1.id] = lambda state: state.has(
             player1.prog_items[0].name, player1.id) and state.has(
             player1.prog_items[1].name, player1.id)
-        multi_world.completion_condition[player2.id] = lambda state: state.has(
+        multiworld.completion_condition[player2.id] = lambda state: state.has(
             player2.prog_items[0].name, player2.id) and state.has(
             player2.prog_items[1].name, player2.id)
 
@@ -830,42 +830,42 @@ def setUp(self) -> None:
 
         # Sphere 1
         region = player1.generate_region(player1.menu, 20)
-        items = fill_region(multi_world, region, [
+        items = fill_region(multiworld, region, [
             player1.prog_items[0]] + items)
 
         # Sphere 2
         region = player1.generate_region(
             player1.regions[1], 20, lambda state: state.has(player1.prog_items[0].name, player1.id))
         items = fill_region(
-            multi_world, region, [player1.prog_items[1], player2.prog_items[0]] + items)
+            multiworld, region, [player1.prog_items[1], player2.prog_items[0]] + items)
 
         # Sphere 3
         region = player2.generate_region(
             player2.menu, 20, lambda state: state.has(player2.prog_items[0].name, player2.id))
-        fill_region(multi_world, region, [player2.prog_items[1]] + items)
+        fill_region(multiworld, region, [player2.prog_items[1]] + items)
 
     def test_balances_progression(self) -> None:
         """Tests that progression balancing moves progression items earlier"""
-        self.multi_world.progression_balancing[self.player1.id].value = 50
-        self.multi_world.progression_balancing[self.player2.id].value = 50
+        self.multiworld.progression_balancing[self.player1.id].value = 50
+        self.multiworld.progression_balancing[self.player2.id].value = 50
 
         self.assertRegionContains(
             self.player1.regions[2], self.player2.prog_items[0])
 
-        balance_multiworld_progression(self.multi_world)
+        balance_multiworld_progression(self.multiworld)
 
         self.assertRegionContains(
             self.player1.regions[1], self.player2.prog_items[0])
 
     def test_balances_progression_light(self) -> None:
         """Test that progression balancing still moves items earlier on minimum value"""
-        self.multi_world.progression_balancing[self.player1.id].value = 1
-        self.multi_world.progression_balancing[self.player2.id].value = 1
+        self.multiworld.progression_balancing[self.player1.id].value = 1
+        self.multiworld.progression_balancing[self.player2.id].value = 1
 
         self.assertRegionContains(
             self.player1.regions[2], self.player2.prog_items[0])
 
-        balance_multiworld_progression(self.multi_world)
+        balance_multiworld_progression(self.multiworld)
 
         # TODO: arrange for a result that's different from the default
         self.assertRegionContains(
@@ -873,13 +873,13 @@ def test_balances_progression_light(self) -> None:
 
     def test_balances_progression_heavy(self) -> None:
         """Test that progression balancing moves items earlier on maximum value"""
-        self.multi_world.progression_balancing[self.player1.id].value = 99
-        self.multi_world.progression_balancing[self.player2.id].value = 99
+        self.multiworld.progression_balancing[self.player1.id].value = 99
+        self.multiworld.progression_balancing[self.player2.id].value = 99
 
         self.assertRegionContains(
             self.player1.regions[2], self.player2.prog_items[0])
 
-        balance_multiworld_progression(self.multi_world)
+        balance_multiworld_progression(self.multiworld)
 
         # TODO: arrange for a result that's different from the default
         self.assertRegionContains(
@@ -887,25 +887,25 @@ def test_balances_progression_heavy(self) -> None:
 
     def test_skips_balancing_progression(self) -> None:
         """Test that progression balancing is skipped when players have it disabled"""
-        self.multi_world.progression_balancing[self.player1.id].value = 0
-        self.multi_world.progression_balancing[self.player2.id].value = 0
+        self.multiworld.progression_balancing[self.player1.id].value = 0
+        self.multiworld.progression_balancing[self.player2.id].value = 0
 
         self.assertRegionContains(
             self.player1.regions[2], self.player2.prog_items[0])
 
-        balance_multiworld_progression(self.multi_world)
+        balance_multiworld_progression(self.multiworld)
 
         self.assertRegionContains(
             self.player1.regions[2], self.player2.prog_items[0])
 
     def test_ignores_priority_locations(self) -> None:
         """Test that progression items on priority locations don't get moved by balancing"""
-        self.multi_world.progression_balancing[self.player1.id].value = 50
-        self.multi_world.progression_balancing[self.player2.id].value = 50
+        self.multiworld.progression_balancing[self.player1.id].value = 50
+        self.multiworld.progression_balancing[self.player2.id].value = 50
 
         self.player2.prog_items[0].location.progress_type = LocationProgressType.PRIORITY
 
-        balance_multiworld_progression(self.multi_world)
+        balance_multiworld_progression(self.multiworld)
 
         self.assertRegionContains(
             self.player1.regions[2], self.player2.prog_items[0])
diff --git a/test/general/test_groups.py b/test/general/test_groups.py
new file mode 100644
index 000000000000..486d3311fa6b
--- /dev/null
+++ b/test/general/test_groups.py
@@ -0,0 +1,27 @@
+from unittest import TestCase
+
+from worlds.AutoWorld import AutoWorldRegister
+
+
+class TestNameGroups(TestCase):
+    def test_item_name_groups_not_empty(self) -> None:
+        """
+        Test that there are no empty item name groups, which is likely a bug.
+        """
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            if not world_type.item_id_to_name:
+                continue  # ignore worlds without items
+            with self.subTest(game=game_name):
+                for name, group in world_type.item_name_groups.items():
+                    self.assertTrue(group, f"Item name group \"{name}\" of \"{game_name}\" is empty")
+
+    def test_location_name_groups_not_empty(self) -> None:
+        """
+        Test that there are no empty location name groups, which is likely a bug.
+        """
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            if not world_type.location_id_to_name:
+                continue  # ignore worlds without locations
+            with self.subTest(game=game_name):
+                for name, group in world_type.location_name_groups.items():
+                    self.assertTrue(group, f"Location name group \"{name}\" of \"{game_name}\" is empty")
diff --git a/test/general/test_items.py b/test/general/test_items.py
index bd6c3fd85305..1612937225f2 100644
--- a/test/general/test_items.py
+++ b/test/general/test_items.py
@@ -43,15 +43,15 @@ def test_item_name_group_conflict(self):
                     with self.subTest(group_name, group_name=group_name):
                         self.assertNotIn(group_name, world_type.item_name_to_id)
 
-    def test_item_count_greater_equal_locations(self):
-        """Test that by the pre_fill step under default settings, each game submits items >= locations"""
+    def test_item_count_equal_locations(self):
+        """Test that by the pre_fill step under default settings, each game submits items == locations"""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game=game_name):
                 multiworld = setup_solo_multiworld(world_type)
-                self.assertGreaterEqual(
+                self.assertEqual(
                     len(multiworld.itempool),
                     len(multiworld.get_unfilled_locations()),
-                    f"{game_name} Item count MUST meet or exceed the number of locations",
+                    f"{game_name} Item count MUST match the number of locations",
                 )
 
     def test_items_in_datapackage(self):
diff --git a/test/general/test_locations.py b/test/general/test_locations.py
index 725b48e62f72..2ac059312c17 100644
--- a/test/general/test_locations.py
+++ b/test/general/test_locations.py
@@ -11,14 +11,14 @@ def test_create_duplicate_locations(self):
             multiworld = setup_solo_multiworld(world_type)
             locations = Counter(location.name for location in multiworld.get_locations())
             if locations:
-                self.assertLessEqual(locations.most_common(1)[0][1], 1,
-                                     f"{world_type.game} has duplicate of location name {locations.most_common(1)}")
+                self.assertEqual(locations.most_common(1)[0][1], 1,
+                                 f"{world_type.game} has duplicate of location name {locations.most_common(1)}")
 
             locations = Counter(location.address for location in multiworld.get_locations()
                                 if type(location.address) is int)
             if locations:
-                self.assertLessEqual(locations.most_common(1)[0][1], 1,
-                                     f"{world_type.game} has duplicate of location ID {locations.most_common(1)}")
+                self.assertEqual(locations.most_common(1)[0][1], 1,
+                                 f"{world_type.game} has duplicate of location ID {locations.most_common(1)}")
 
     def test_locations_in_datapackage(self):
         """Tests that created locations not filled before fill starts exist in the datapackage."""
diff --git a/test/general/test_reachability.py b/test/general/test_reachability.py
index cfd83c940463..e57c398b7beb 100644
--- a/test/general/test_reachability.py
+++ b/test/general/test_reachability.py
@@ -36,15 +36,15 @@ def test_default_all_state_can_reach_everything(self):
         for game_name, world_type in AutoWorldRegister.world_types.items():
             unreachable_regions = self.default_settings_unreachable_regions.get(game_name, set())
             with self.subTest("Game", game=game_name):
-                world = setup_solo_multiworld(world_type)
-                excluded = world.worlds[1].options.exclude_locations.value
-                state = world.get_all_state(False)
-                for location in world.get_locations():
+                multiworld = setup_solo_multiworld(world_type)
+                excluded = multiworld.worlds[1].options.exclude_locations.value
+                state = multiworld.get_all_state(False)
+                for location in multiworld.get_locations():
                     if location.name not in excluded:
                         with self.subTest("Location should be reached", location=location):
                             self.assertTrue(location.can_reach(state), f"{location.name} unreachable")
 
-                for region in world.get_regions():
+                for region in multiworld.get_regions():
                     if region.name in unreachable_regions:
                         with self.subTest("Region should be unreachable", region=region):
                             self.assertFalse(region.can_reach(state))
@@ -53,15 +53,15 @@ def test_default_all_state_can_reach_everything(self):
                             self.assertTrue(region.can_reach(state))
 
                 with self.subTest("Completion Condition"):
-                    self.assertTrue(world.can_beat_game(state))
+                    self.assertTrue(multiworld.can_beat_game(state))
 
     def test_default_empty_state_can_reach_something(self):
         """Ensure empty state can reach at least one location with the defined options"""
         for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game=game_name):
-                world = setup_solo_multiworld(world_type)
-                state = CollectionState(world)
-                all_locations = world.get_locations()
+                multiworld = setup_solo_multiworld(world_type)
+                state = CollectionState(multiworld)
+                all_locations = multiworld.get_locations()
                 if all_locations:
                     locations = set()
                     for location in all_locations:
diff --git a/worlds/__init__.py b/worlds/__init__.py
index 66c91639b9f3..168bba7abf41 100644
--- a/worlds/__init__.py
+++ b/worlds/__init__.py
@@ -3,7 +3,9 @@
 import sys
 import warnings
 import zipimport
-from typing import Dict, List, NamedTuple, TypedDict
+import time
+import dataclasses
+from typing import Dict, List, TypedDict, Optional
 
 from Utils import local_path, user_path
 
@@ -34,10 +36,12 @@ class DataPackage(TypedDict):
     games: Dict[str, GamesPackage]
 
 
-class WorldSource(NamedTuple):
+@dataclasses.dataclass(order=True)
+class WorldSource:
     path: str  # typically relative path from this module
     is_zip: bool = False
     relative: bool = True  # relative to regular world import folder
+    time_taken: Optional[float] = None
 
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.path}, is_zip={self.is_zip}, relative={self.relative})"
@@ -50,6 +54,7 @@ def resolved_path(self) -> str:
 
     def load(self) -> bool:
         try:
+            start = time.perf_counter()
             if self.is_zip:
                 importer = zipimport.zipimporter(self.resolved_path)
                 if hasattr(importer, "find_spec"):  # new in Python 3.10
@@ -69,6 +74,7 @@ def load(self) -> bool:
                         importer.exec_module(mod)
             else:
                 importlib.import_module(f".{self.path}", "worlds")
+            self.time_taken = time.perf_counter()-start
             return True
 
         except Exception:
diff --git a/worlds/adventure/__init__.py b/worlds/adventure/__init__.py
index 105725bd053c..9b9b0d77d800 100644
--- a/worlds/adventure/__init__.py
+++ b/worlds/adventure/__init__.py
@@ -271,7 +271,7 @@ def pre_fill(self):
         overworld_locations_copy = overworld.locations.copy()
         all_locations = self.multiworld.get_locations(self.player)
 
-        locations_copy = all_locations.copy()
+        locations_copy = list(all_locations)
         for loc in all_locations:
             if loc.item is not None or loc.progress_type != LocationProgressType.DEFAULT:
                 locations_copy.remove(loc)
diff --git a/worlds/alttp/Rules.py b/worlds/alttp/Rules.py
index 8a04f87afa02..98ab805b5c08 100644
--- a/worlds/alttp/Rules.py
+++ b/worlds/alttp/Rules.py
@@ -968,6 +968,9 @@ def standard_rules(world, player):
 
         set_rule(world.get_location('Sewers - Key Rat Key Drop', player),
                  lambda state: state._lttp_has_key('Small Key (Hyrule Castle)', player, 3))
+    else:
+        set_rule(world.get_location('Hyrule Castle - Zelda\'s Chest', player),
+                 lambda state: state.has('Big Key (Hyrule Castle)', player))
 
 def toss_junk_item(world, player):
     items = ['Rupees (20)', 'Bombs (3)', 'Arrows (10)', 'Rupees (5)', 'Rupee (1)', 'Bombs (10)',
diff --git a/worlds/kh2/Locations.py b/worlds/kh2/Locations.py
index 61fafe909412..100e971e7dff 100644
--- a/worlds/kh2/Locations.py
+++ b/worlds/kh2/Locations.py
@@ -1356,5 +1356,5 @@
 location_groups: typing.Dict[str, list]
 location_groups = {
     Region_Name: [loc for loc in Region_Locs if "Event" not in loc]
-    for Region_Name, Region_Locs in KH2REGIONS.items() if Region_Locs
+    for Region_Name, Region_Locs in KH2REGIONS.items() if Region_Locs and "Event" not in Region_Locs[0]
 }
diff --git a/worlds/lingo/__init__.py b/worlds/lingo/__init__.py
index 088967445007..2f9354193250 100644
--- a/worlds/lingo/__init__.py
+++ b/worlds/lingo/__init__.py
@@ -82,9 +82,8 @@ def create_items(self):
                 skips = int(non_traps * skip_percentage / 100.0)
                 non_skips = non_traps - skips
 
-                filler_list = [":)", "The Feeling of Being Lost", "Wanderlust", "Empty White Hallways"]
                 for i in range(0, non_skips):
-                    pool.append(self.create_item(filler_list[i % len(filler_list)]))
+                    pool.append(self.create_item(self.get_filler_item_name()))
 
                 for i in range(0, skips):
                     pool.append(self.create_item("Puzzle Skip"))
@@ -130,3 +129,7 @@ def fill_slot_data(self):
             slot_data["painting_entrance_to_exit"] = self.player_logic.painting_mapping
 
         return slot_data
+
+    def get_filler_item_name(self) -> str:
+        filler_list = [":)", "The Feeling of Being Lost", "Wanderlust", "Empty White Hallways"]
+        return self.random.choice(filler_list)
diff --git a/worlds/lingo/options.py b/worlds/lingo/options.py
index ec6158fab5ae..ed1426450eb7 100644
--- a/worlds/lingo/options.py
+++ b/worlds/lingo/options.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from Options import Toggle, Choice, DefaultOnToggle, Range, PerGameCommonOptions
+from Options import Toggle, Choice, DefaultOnToggle, Range, PerGameCommonOptions, StartInventoryPool
 
 
 class ShuffleDoors(Choice):
@@ -136,3 +136,4 @@ class LingoOptions(PerGameCommonOptions):
     trap_percentage: TrapPercentage
     puzzle_skip_percentage: PuzzleSkipPercentage
     death_link: DeathLink
+    start_inventory_from_pool: StartInventoryPool
diff --git a/worlds/pokemon_rb/items.py b/worlds/pokemon_rb/items.py
index b584869f41b9..24cad13252b1 100644
--- a/worlds/pokemon_rb/items.py
+++ b/worlds/pokemon_rb/items.py
@@ -42,7 +42,7 @@ def __init__(self, item_id, classification, groups):
     "Repel": ItemData(30, ItemClassification.filler, ["Consumables"]),
     "Old Amber": ItemData(31, ItemClassification.progression_skip_balancing, ["Unique", "Fossils", "Key Items"]),
     "Fire Stone": ItemData(32, ItemClassification.progression_skip_balancing, ["Unique", "Evolution Stones", "Key Items"]),
-    "Thunder Stone": ItemData(33, ItemClassification.progression_skip_balancing, ["Unique", "Evolution Stones" "Key Items"]),
+    "Thunder Stone": ItemData(33, ItemClassification.progression_skip_balancing, ["Unique", "Evolution Stones", "Key Items"]),
     "Water Stone": ItemData(34, ItemClassification.progression_skip_balancing, ["Unique", "Evolution Stones", "Key Items"]),
     "HP Up": ItemData(35, ItemClassification.filler, ["Consumables", "Vitamins"]),
     "Protein": ItemData(36, ItemClassification.filler, ["Consumables", "Vitamins"]),
diff --git a/worlds/stardew_valley/docs/en_Stardew Valley.md b/worlds/stardew_valley/docs/en_Stardew Valley.md
index a880a40b971a..04ba9c15c3c1 100644
--- a/worlds/stardew_valley/docs/en_Stardew Valley.md	
+++ b/worlds/stardew_valley/docs/en_Stardew Valley.md	
@@ -124,6 +124,6 @@ List of supported mods:
 
 ## Multiplayer
 
-You cannot play an Archipelago Slot in multiplayer at the moment. There is no short-terms plans to support that feature.
+You cannot play an Archipelago Slot in multiplayer at the moment. There are no short-term plans to support that feature.
 
 You can, however, send Stardew Valley objects as gifts from one Stardew Player to another Stardew player, using in-game Joja Prime delivery, for a fee. This exclusive feature can be turned off if you don't want to send and receive gifts.
diff --git a/worlds/stardew_valley/docs/setup_en.md b/worlds/stardew_valley/docs/setup_en.md
index 68c7fb9af6a0..d8f0e16b1017 100644
--- a/worlds/stardew_valley/docs/setup_en.md
+++ b/worlds/stardew_valley/docs/setup_en.md
@@ -84,4 +84,4 @@ See the [Supported mods documentation](https://github.com/agilbert1412/StardewAr
 
 ### Multiplayer
 
-You cannot play an Archipelago Slot in multiplayer at the moment. There are no short-terms plans to support that feature.
\ No newline at end of file
+You cannot play an Archipelago Slot in multiplayer at the moment. There are no short-term plans to support that feature.
diff --git a/worlds/tunic/er_data.py b/worlds/tunic/er_data.py
index 2d3bcc025f4b..95d33d4aff67 100644
--- a/worlds/tunic/er_data.py
+++ b/worlds/tunic/er_data.py
@@ -37,7 +37,7 @@ def scene_destination(self) -> str:  # full, nonchanging name to interpret by th
            destination="Furnace_gyro_lower"),
     Portal(name="Caustic Light Cave Entrance", region="Overworld",
            destination="Overworld Cave_"),
-    Portal(name="Swamp Upper Entrance", region="Overworld Laurels",
+    Portal(name="Swamp Upper Entrance", region="Overworld Swamp Upper Entry",
            destination="Swamp Redux 2_wall"),
     Portal(name="Swamp Lower Entrance", region="Overworld",
            destination="Swamp Redux 2_conduit"),
@@ -49,7 +49,7 @@ def scene_destination(self) -> str:  # full, nonchanging name to interpret by th
            destination="Atoll Redux_upper"),
     Portal(name="Atoll Lower Entrance", region="Overworld",
            destination="Atoll Redux_lower"),
-    Portal(name="Special Shop Entrance", region="Overworld Laurels",
+    Portal(name="Special Shop Entrance", region="Overworld Special Shop Entry",
            destination="ShopSpecial_"),
     Portal(name="Maze Cave Entrance", region="Overworld",
            destination="Maze Room_"),
@@ -57,7 +57,7 @@ def scene_destination(self) -> str:  # full, nonchanging name to interpret by th
            destination="Archipelagos Redux_upper"),
     Portal(name="West Garden Entrance from Furnace", region="Overworld to West Garden from Furnace",
            destination="Archipelagos Redux_lower"),
-    Portal(name="West Garden Laurels Entrance", region="Overworld Laurels",
+    Portal(name="West Garden Laurels Entrance", region="Overworld West Garden Laurels Entry",
            destination="Archipelagos Redux_lowest"),
     Portal(name="Temple Door Entrance", region="Overworld Temple Door",
            destination="Temple_main"),
@@ -533,7 +533,9 @@ class Hint(IntEnum):
     "Overworld": RegionInfo("Overworld Redux"),
     "Overworld Holy Cross": RegionInfo("Fake", dead_end=DeadEnd.all_cats),
     "Overworld Belltower": RegionInfo("Overworld Redux"),  # the area with the belltower and chest
-    "Overworld Laurels": RegionInfo("Overworld Redux"),  # all spots in Overworld that you need laurels to reach
+    "Overworld Swamp Upper Entry": RegionInfo("Overworld Redux"),  # upper swamp entry spot
+    "Overworld Special Shop Entry": RegionInfo("Overworld Redux"),  # special shop entry spot
+    "Overworld West Garden Laurels Entry": RegionInfo("Overworld Redux"),  # west garden laurels entry
     "Overworld to West Garden from Furnace": RegionInfo("Overworld Redux", hint=Hint.region),
     "Overworld Well to Furnace Rail": RegionInfo("Overworld Redux"),  # the tiny rail passageway
     "Overworld Ruined Passage Door": RegionInfo("Overworld Redux"),  # the small space betweeen the door and the portal
@@ -710,7 +712,7 @@ class Hint(IntEnum):
     hallway_helper[p2] = p1
 
 # so we can just loop over this instead of doing some complicated thing to deal with hallways in the hints
-hallways_nmg: Dict[str, str] = {
+hallways_ur: Dict[str, str] = {
     "Ruins Passage, Overworld Redux_east": "Ruins Passage, Overworld Redux_west",
     "East Forest Redux Interior, East Forest Redux_upper": "East Forest Redux Interior, East Forest Redux_lower",
     "Forest Boss Room, East Forest Redux Laddercave_": "Forest Boss Room, Forest Belltower_",
@@ -720,20 +722,22 @@ class Hint(IntEnum):
     "ziggurat2020_0, Quarry Redux_": "ziggurat2020_0, ziggurat2020_1_",
     "Purgatory, Purgatory_bottom": "Purgatory, Purgatory_top",
 }
-hallway_helper_nmg: Dict[str, str] = {}
-for p1, p2 in hallways.items():
-    hallway_helper[p1] = p2
-    hallway_helper[p2] = p1
+hallway_helper_ur: Dict[str, str] = {}
+for p1, p2 in hallways_ur.items():
+    hallway_helper_ur[p1] = p2
+    hallway_helper_ur[p2] = p1
 
 
 # the key is the region you have, the value is the regions you get for having that region
 # this is mostly so we don't have to do something overly complex to get this information
 dependent_regions: Dict[Tuple[str, ...], List[str]] = {
-    ("Overworld", "Overworld Belltower", "Overworld Laurels", "Overworld Southeast Cross Door", "Overworld Temple Door",
+    ("Overworld", "Overworld Belltower", "Overworld Swamp Upper Entry", "Overworld Special Shop Entry",
+     "Overworld West Garden Laurels Entry", "Overworld Southeast Cross Door", "Overworld Temple Door",
      "Overworld Fountain Cross Door", "Overworld Town Portal", "Overworld Spawn Portal"):
-         ["Overworld", "Overworld Belltower", "Overworld Laurels", "Overworld Ruined Passage Door",
-          "Overworld Southeast Cross Door", "Overworld Old House Door", "Overworld Temple Door",
-          "Overworld Fountain Cross Door", "Overworld Town Portal", "Overworld Spawn Portal"],
+         ["Overworld", "Overworld Belltower", "Overworld Swamp Upper Entry", "Overworld Special Shop Entry",
+          "Overworld West Garden Laurels Entry", "Overworld Ruined Passage Door", "Overworld Southeast Cross Door",
+          "Overworld Old House Door", "Overworld Temple Door", "Overworld Fountain Cross Door", "Overworld Town Portal",
+          "Overworld Spawn Portal"],
     ("Old House Front",):
         ["Old House Front", "Old House Back"],
     ("Furnace Fuse", "Furnace Ladder Area", "Furnace Walking Path"):
@@ -818,12 +822,14 @@ class Hint(IntEnum):
 
 
 dependent_regions_nmg: Dict[Tuple[str, ...], List[str]] = {
-    ("Overworld", "Overworld Belltower", "Overworld Laurels", "Overworld Southeast Cross Door", "Overworld Temple Door",
+    ("Overworld", "Overworld Belltower", "Overworld Swamp Upper Entry", "Overworld Special Shop Entry",
+     "Overworld West Garden Laurels Entry", "Overworld Southeast Cross Door", "Overworld Temple Door",
      "Overworld Fountain Cross Door", "Overworld Town Portal", "Overworld Spawn Portal",
      "Overworld Ruined Passage Door"):
-         ["Overworld", "Overworld Belltower", "Overworld Laurels", "Overworld Ruined Passage Door",
-          "Overworld Southeast Cross Door", "Overworld Old House Door", "Overworld Temple Door",
-          "Overworld Fountain Cross Door", "Overworld Town Portal", "Overworld Spawn Portal"],
+         ["Overworld", "Overworld Belltower", "Overworld Swamp Upper Entry", "Overworld Special Shop Entry",
+          "Overworld West Garden Laurels Entry", "Overworld Ruined Passage Door", "Overworld Southeast Cross Door",
+          "Overworld Old House Door", "Overworld Temple Door", "Overworld Fountain Cross Door", "Overworld Town Portal",
+          "Overworld Spawn Portal"],
     # can laurels through the gate
     ("Old House Front", "Old House Back"):
         ["Old House Front", "Old House Back"],
@@ -908,13 +914,14 @@ class Hint(IntEnum):
 
 dependent_regions_ur: Dict[Tuple[str, ...], List[str]] = {
     # can use ladder storage to get to the well rail
-    ("Overworld", "Overworld Belltower", "Overworld Laurels", "Overworld Southeast Cross Door", "Overworld Temple Door",
+    ("Overworld", "Overworld Belltower", "Overworld Swamp Upper Entry", "Overworld Special Shop Entry",
+     "Overworld West Garden Laurels Entry", "Overworld Southeast Cross Door", "Overworld Temple Door",
      "Overworld Fountain Cross Door", "Overworld Town Portal", "Overworld Spawn Portal",
      "Overworld Ruined Passage Door"):
-         ["Overworld", "Overworld Belltower", "Overworld Laurels", "Overworld Ruined Passage Door",
-          "Overworld Southeast Cross Door", "Overworld Old House Door", "Overworld Temple Door",
-          "Overworld Fountain Cross Door", "Overworld Town Portal", "Overworld Spawn Portal",
-          "Overworld Well to Furnace Rail"],
+         ["Overworld", "Overworld Belltower", "Overworld Swamp Upper Entry", "Overworld Special Shop Entry",
+          "Overworld West Garden Laurels Entry", "Overworld Ruined Passage Door", "Overworld Southeast Cross Door",
+          "Overworld Old House Door", "Overworld Temple Door", "Overworld Fountain Cross Door", "Overworld Town Portal",
+          "Overworld Spawn Portal", "Overworld Well to Furnace Rail"],
     # can laurels through the gate
     ("Old House Front", "Old House Back"):
         ["Old House Front", "Old House Back"],
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index 5d88022dc159..ab0cf02bd97c 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -53,9 +53,23 @@ def set_er_region_rules(world: "TunicWorld", ability_unlocks: Dict[str, int], re
         or (state.has(laurels, player) and options.logic_rules))
 
     regions["Overworld"].connect(
-        connecting_region=regions["Overworld Laurels"],
+        connecting_region=regions["Overworld Swamp Upper Entry"],
         rule=lambda state: state.has(laurels, player))
-    regions["Overworld Laurels"].connect(
+    regions["Overworld Swamp Upper Entry"].connect(
+        connecting_region=regions["Overworld"],
+        rule=lambda state: state.has(laurels, player))
+
+    regions["Overworld"].connect(
+        connecting_region=regions["Overworld Special Shop Entry"],
+        rule=lambda state: state.has(laurels, player))
+    regions["Overworld Special Shop Entry"].connect(
+        connecting_region=regions["Overworld"],
+        rule=lambda state: state.has(laurels, player))
+
+    regions["Overworld"].connect(
+        connecting_region=regions["Overworld West Garden Laurels Entry"],
+        rule=lambda state: state.has(laurels, player))
+    regions["Overworld West Garden Laurels Entry"].connect(
         connecting_region=regions["Overworld"],
         rule=lambda state: state.has(laurels, player))
 
@@ -230,7 +244,6 @@ def set_er_region_rules(world: "TunicWorld", ability_unlocks: Dict[str, int], re
         connecting_region=regions["West Garden Laurels Exit"],
         rule=lambda state: state.has(laurels, player))
 
-    # todo: can you wake the boss, then grapple to it, then kill it?
     regions["West Garden after Boss"].connect(
         connecting_region=regions["West Garden"],
         rule=lambda state: state.has(laurels, player))
diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py
index 4d640b2fda78..4e28344b20ad 100644
--- a/worlds/tunic/er_scripts.py
+++ b/worlds/tunic/er_scripts.py
@@ -1,7 +1,7 @@
 from typing import Dict, List, Set, Tuple, TYPE_CHECKING
 from BaseClasses import Region, ItemClassification, Item, Location
 from .locations import location_table
-from .er_data import Portal, tunic_er_regions, portal_mapping, hallway_helper, hallway_helper_nmg, \
+from .er_data import Portal, tunic_er_regions, portal_mapping, hallway_helper, hallway_helper_ur, \
     dependent_regions, dependent_regions_nmg, dependent_regions_ur
 from .er_rules import set_er_region_rules
 
@@ -28,8 +28,8 @@ def hint_helper(portal: Portal, hint_string: str = "") -> str:
         if hint_string == "":
             hint_string = portal.name
 
-        if logic_rules:
-            hallways = hallway_helper_nmg
+        if logic_rules == "unrestricted":
+            hallways = hallway_helper_ur
         else:
             hallways = hallway_helper
 
diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index c00827feee20..e2d1069bd1d6 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -75,6 +75,9 @@
     "Have you tried Bumper Stickers?\nMaybe after spending so much time on this island, you are longing for a simpler puzzle game.",
     "Have you tried Pokemon Emerald?\nI'm going to say it: 10/10, just the right amount of water.",
     "Have you tried Terraria?\nA prime example of a survival sandbox game that beats the \"Wide as an ocean, deep as a puddle\" allegations.",
+    "Have you tried Final Fantasy Mystic Quest?\nApparently, it was made in an attempt to simplify Final Fantasy for the western market.\nThey were right, I suck at RPGs.",
+    "Have you tried Shivers?\nWitness 2 should totally feature a haunted Museum.",
+    "Have you tried Heretic?\nWait, there is a Doom Engine game where you can look UP AND DOWN???",
     
     "One day I was fascinated by the subject of generation of waves by wind.",
     "I don't like sandwiches. Why would you think I like sandwiches? Have you ever seen me with a sandwich?",
@@ -148,7 +151,7 @@
     "You don't have Boat? Invisible boat time!\nYou do have boat? Boat clipping time!",
     "Cet indice est en français. Nous nous excusons de tout inconvénients engendrés par cela.",
     "How many of you have personally witnessed a total solar eclipse?",
-    "In the Treehouse area, you will find \n[Error: Data not found] progression items.",
+    "In the Treehouse area, you will find 69 progression items.\nNice.\n(Source: Just trust me)",
     "Lingo\nLingoing\nLingone",
     "The name of the captain was Albert Einstein.",
     "Panel impossible Sigma plz fix",