diff --git a/evennia/__init__.py b/evennia/__init__.py
index 1753c09d9..eefba35d4 100644
--- a/evennia/__init__.py
+++ b/evennia/__init__.py
@@ -363,9 +363,9 @@ def _init():
     # delayed starts - important so as to not back-access evennia before it has
     # finished initializing
     GLOBAL_SCRIPTS.start()
-    from .prototypes import prototypes
-    prototypes.load_module_prototypes()
-    del prototypes
+    # from .prototypes import prototypes
+    # prototypes.load_module_prototypes()
+    # del prototypes
 
 
 def set_trace(term_size=(140, 80), debugger="auto"):
diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 0f0f7809b..2d28d67b6 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -1669,8 +1669,8 @@ class TestBuilding(EvenniaCommandTest):
         self.call(building.CmdScripts(), "Obj", "No scripts defined on Obj")
         self.call(
             building.CmdScripts(),
-            "Obj = scripts.Script",
-            "Script scripts.Script successfully added"
+            "Obj = scripts.scripts.DefaultScript",
+            "Script scripts.scripts.DefaultScript successfully added"
         )
         self.call(
             building.CmdScripts(),
@@ -1690,25 +1690,25 @@ class TestBuilding(EvenniaCommandTest):
         self.call(building.CmdScripts(), "/stop Obj", "Script on Obj Stopped - ")
 
         self.call(
-            building.CmdScripts(), "Obj = scripts.Script",
-            "Script scripts.Script successfully added",
+            building.CmdScripts(), "Obj = scripts.scripts.DefaultScript",
+            "Script scripts.scripts.DefaultScript successfully added",
             inputs=["Y"]
         )
         self.call(
             building.CmdScripts(),
-            "/start Obj = scripts.Script",
+            "/start Obj = scripts.scripts.DefaultScript",
             "Script on Obj Started ",
             inputs=["Y"]
         )
         self.call(
             building.CmdScripts(),
-            "/stop Obj = scripts.Script",
+            "/stop Obj = scripts.scripts.DefaultScript",
             "Script on Obj Stopped ",
             inputs=["Y"]
         )
         self.call(
             building.CmdScripts(),
-            "/delete Obj = scripts.Script",
+            "/delete Obj = scripts.scripts.DefaultScript",
             "Script on Obj Deleted ",
             inputs=["Y"]
         )
diff --git a/evennia/contrib/base_systems/menu_login/menu_login.py b/evennia/contrib/base_systems/menu_login/menu_login.py
index 4353f71bd..59207a427 100644
--- a/evennia/contrib/base_systems/menu_login/menu_login.py
+++ b/evennia/contrib/base_systems/menu_login/menu_login.py
@@ -244,7 +244,7 @@ class CmdUnloggedinLook(Command):
         """
         EvMenu(
             self.caller,
-            "evennia.contrib.base_systems.menu_login",
+            "evennia.contrib.base_systems.menu_login.menu_login",
             startnode="node_enter_username",
             auto_look=False,
             auto_quit=False,
diff --git a/evennia/contrib/utils/fieldfill/__init__.py b/evennia/contrib/utils/fieldfill/__init__.py
index d4f50ce11..ff8ce2b50 100644
--- a/evennia/contrib/utils/fieldfill/__init__.py
+++ b/evennia/contrib/utils/fieldfill/__init__.py
@@ -5,3 +5,6 @@ FieldFill contrib - Tim Ashley Jenkins 2018
 
 from .fieldfill import FieldEvMenu  # noqa
 from .fieldfill import CmdTestMenu  # noqa
+from .fieldfill import init_fill_field # noqa
+from .fieldfill import form_template_to_dict # noqa
+from .fieldfill import display_formdata # noqa
diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index c625d72ed..4aaedb8e3 100644
--- a/evennia/utils/evmenu.py
+++ b/evennia/utils/evmenu.py
@@ -1335,6 +1335,9 @@ def list_node(option_generator, select=None, pagesize=10):
         ```python
         def select(caller, selection, available_choices=None, **kwargs):
             '''
+            This will be called by all auto-generated options except any 'extra_options'
+            you return from the node (those you need to handle normally).
+
             Args:
                 caller (Object or Account): User of the menu.
                 selection (str): What caller chose in the menu
@@ -1344,6 +1347,7 @@ def list_node(option_generator, select=None, pagesize=10):
             Returns:
                 tuple, str or None: A tuple (nextnodename, **kwargs) or just nextnodename.  Return
                     `None` to go back to the listnode.
+            '''
 
             # (do something with `selection` here)