diff --git a/BaseClasses.py b/BaseClasses.py
index 972ae07a..9e3192f5 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -8,7 +8,7 @@ from collections import OrderedDict, Counter, deque
 
 from EntranceShuffle import door_addresses, indirect_connections
 from Utils import int16_as_bytes
-from typing import Union
+from typing import Union, Optional
 
 import secrets
 import random
@@ -21,7 +21,8 @@ class World(object):
     difficulty_requirements: dict
     required_medallions: dict
 
-    def __init__(self, players, shuffle, logic, mode, swords, difficulty, difficulty_adjustments, timer, progressive,
+    def __init__(self, players: int, shuffle, logic, mode, swords, difficulty, difficulty_adjustments, timer,
+                 progressive,
                  goal, algorithm, accessibility, shuffle_ganon, retro, custom, customitemarray, hints):
         if self.debug_types:
             import inspect
@@ -959,7 +960,8 @@ class Boss(object):
         return self.defeat_rule(state, self.player)
 
 class Location(object):
-    def __init__(self, player: int, name: str = '', address=None, crystal=False, hint_text=None, parent=None,
+    def __init__(self, player: int, name: str = '', address=None, crystal: bool = False,
+                 hint_text: Optional[str] = None, parent=None,
                  player_address=None):
         self.name = name
         self.parent_region = parent
diff --git a/Gui.py b/Gui.py
index 725af742..16ca9d06 100755
--- a/Gui.py
+++ b/Gui.py
@@ -1210,7 +1210,7 @@ def guiMain(args=None):
 
     triforcepieceFrame = Frame(itemList5)
     triforcepieceLabel = Label(triforcepieceFrame, text='Triforce Piece')
-    triforcepieceVar = StringVar(value='0')
+    triforcepieceVar = StringVar(value='30')
     triforcepieceEntry = Entry(triforcepieceFrame, textvariable=triforcepieceVar, width=3, validate='all', vcmd=vcmd)
     triforcepieceFrame.pack()
     triforcepieceLabel.pack(anchor=W, side=LEFT, padx=(0,55))
@@ -1218,7 +1218,7 @@ def guiMain(args=None):
 
     triforcecountFrame = Frame(itemList5)
     triforcecountLabel = Label(triforcecountFrame, text='Triforce Pieces Required')
-    triforcecountVar = StringVar(value='0')
+    triforcecountVar = StringVar(value='20')
     triforcecountEntry = Entry(triforcecountFrame, textvariable=triforcecountVar, width=3, validate='all', vcmd=vcmd)
     triforcecountFrame.pack()
     triforcecountLabel.pack(anchor=W, side=LEFT, padx=(0,0))