diff --git a/worlds/yachtdice/Locations.py b/worlds/yachtdice/Locations.py
index 0e1679edae..d1fd691991 100644
--- a/worlds/yachtdice/Locations.py
+++ b/worlds/yachtdice/Locations.py
@@ -65,7 +65,7 @@ def ini_locations(goal_score, max_score, number_of_locations, dif):
 
     location_table = {f"{score} score": LocData(starting_index + score, "Board", score) for score in scores}
 
-    return location_table, scores.index(goal_score)
+    return location_table
 
 
 # we need to run this function to initialize all scores from 1 to 1000, even though not all are used
diff --git a/worlds/yachtdice/__init__.py b/worlds/yachtdice/__init__.py
index 0afb1af677..32b3c70adc 100644
--- a/worlds/yachtdice/__init__.py
+++ b/worlds/yachtdice/__init__.py
@@ -220,7 +220,10 @@ class YachtDiceWorld(World):
                 multipliers_added += 1
                 return "Step Score Multiplier"
             elif which_item_to_add == "Double category":
-                cat_weights = [2, 2, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1]
+                # Below entries are the weights to add each category.
+                # Prefer to add choice or number categories, because the other categories are too "all or nothing",
+                # which often don't give any points, until you get overpowered, and then they give all points.
+                cat_weights = [2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1]
                 weights["Double category"] /= 1.1
                 return self.random.choices(possible_categories, weights=cat_weights)[0]
             elif which_item_to_add == "Points":
@@ -356,7 +359,7 @@ class YachtDiceWorld(World):
 
     def create_regions(self):
         # call the ini_locations function, that generates locations based on the inputs.
-        location_table, goal_index = ini_locations(
+        location_table = ini_locations(
             self.goal_score, self.max_score, self.number_of_locations, self.options.game_difficulty.value
         )
 
@@ -373,11 +376,8 @@ class YachtDiceWorld(World):
 
         # Add the victory item to the correct location.
         # The website declares that the game is complete when the victory item is obtained.
-        board.locations[goal_index].place_locked_item(self.create_item("Victory"))
-
-        # these will be slot_data input
-        self.goal_score = board.locations[goal_index].yacht_dice_score
-        self.max_score = board.locations[-1].yacht_dice_score
+        victory_location_name = f"{self.goal_score} score"
+        self.get_location(victory_location_name).place_locked_item(self.create_item("Victory"))
 
         # add the regions
         connection = Entrance(self.player, "New Board", menu)