diff --git a/_module/are/ranzfarmhouse.are.json b/_module/are/ranzfarmhouse.are.json
index 19e8355c..85f68752 100644
--- a/_module/are/ranzfarmhouse.are.json
+++ b/_module/are/ranzfarmhouse.are.json
@@ -499,13 +499,17 @@
       }
     ]
   },
+  "TileBrdrDisabled": {
+    "type": "byte",
+    "value": 0
+  },
   "Tileset": {
     "type": "resref",
     "value": "tin01"
   },
   "Version": {
     "type": "dword",
-    "value": 17
+    "value": 19
   },
   "Width": {
     "type": "int",
diff --git a/_module/dlg/cv_oldmary.dlg.json b/_module/dlg/cv_oldmary.dlg.json
new file mode 100644
index 00000000..ef4ba002
--- /dev/null
+++ b/_module/dlg/cv_oldmary.dlg.json
@@ -0,0 +1,304 @@
+{
+  "__data_type": "DLG ",
+  "DelayEntry": {
+    "type": "dword",
+    "value": 0
+  },
+  "DelayReply": {
+    "type": "dword",
+    "value": 0
+  },
+  "EndConverAbort": {
+    "type": "resref",
+    "value": "nw_walk_wp"
+  },
+  "EndConversation": {
+    "type": "resref",
+    "value": "nw_walk_wp"
+  },
+  "EntryList": {
+    "type": "list",
+    "value": [
+      {
+        "__struct_id": 0,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
+        "Animation": {
+          "type": "dword",
+          "value": 0
+        },
+        "AnimLoop": {
+          "type": "byte",
+          "value": 1
+        },
+        "Comment": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "Delay": {
+          "type": "dword",
+          "value": 4294967295
+        },
+        "Quest": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "RepliesList": {
+          "type": "list",
+          "value": [
+            {
+              "__struct_id": 0,
+              "Active": {
+                "type": "resref",
+                "value": ""
+              },
+              "ConditionParams": {
+                "type": "list",
+                "value": []
+              },
+              "Index": {
+                "type": "dword",
+                "value": 1
+              },
+              "IsChild": {
+                "type": "byte",
+                "value": 0
+              }
+            },
+            {
+              "__struct_id": 1,
+              "Active": {
+                "type": "resref",
+                "value": ""
+              },
+              "ConditionParams": {
+                "type": "list",
+                "value": []
+              },
+              "Index": {
+                "type": "dword",
+                "value": 0
+              },
+              "IsChild": {
+                "type": "byte",
+                "value": 0
+              }
+            }
+          ]
+        },
+        "Script": {
+          "type": "resref",
+          "value": ""
+        },
+        "Sound": {
+          "type": "resref",
+          "value": ""
+        },
+        "Speaker": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "Text": {
+          "type": "cexolocstring",
+          "value": {
+            "0": "Are you looking for baking supplies?"
+          }
+        }
+      },
+      {
+        "__struct_id": 1,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
+        "Animation": {
+          "type": "dword",
+          "value": 0
+        },
+        "AnimLoop": {
+          "type": "byte",
+          "value": 1
+        },
+        "Comment": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "Delay": {
+          "type": "dword",
+          "value": 4294967295
+        },
+        "Quest": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "RepliesList": {
+          "type": "list",
+          "value": []
+        },
+        "Script": {
+          "type": "resref",
+          "value": ""
+        },
+        "Sound": {
+          "type": "resref",
+          "value": ""
+        },
+        "Speaker": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "Text": {
+          "type": "cexolocstring",
+          "value": {
+            "0": "Take a look."
+          }
+        }
+      }
+    ]
+  },
+  "NumWords": {
+    "type": "dword",
+    "value": 11
+  },
+  "PreventZoomIn": {
+    "type": "byte",
+    "value": 0
+  },
+  "ReplyList": {
+    "type": "list",
+    "value": [
+      {
+        "__struct_id": 0,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
+        "Animation": {
+          "type": "dword",
+          "value": 0
+        },
+        "AnimLoop": {
+          "type": "byte",
+          "value": 1
+        },
+        "Comment": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "Delay": {
+          "type": "dword",
+          "value": 4294967295
+        },
+        "EntriesList": {
+          "type": "list",
+          "value": []
+        },
+        "Quest": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "Script": {
+          "type": "resref",
+          "value": ""
+        },
+        "Sound": {
+          "type": "resref",
+          "value": ""
+        },
+        "Text": {
+          "type": "cexolocstring",
+          "value": {
+            "0": "No."
+          }
+        }
+      },
+      {
+        "__struct_id": 1,
+        "ActionParams": {
+          "type": "list",
+          "value": []
+        },
+        "Animation": {
+          "type": "dword",
+          "value": 0
+        },
+        "AnimLoop": {
+          "type": "byte",
+          "value": 1
+        },
+        "Comment": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "Delay": {
+          "type": "dword",
+          "value": 4294967295
+        },
+        "EntriesList": {
+          "type": "list",
+          "value": [
+            {
+              "__struct_id": 0,
+              "Active": {
+                "type": "resref",
+                "value": "x1_openstore"
+              },
+              "ConditionParams": {
+                "type": "list",
+                "value": []
+              },
+              "Index": {
+                "type": "dword",
+                "value": 1
+              },
+              "IsChild": {
+                "type": "byte",
+                "value": 0
+              }
+            }
+          ]
+        },
+        "Quest": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "Script": {
+          "type": "resref",
+          "value": ""
+        },
+        "Sound": {
+          "type": "resref",
+          "value": ""
+        },
+        "Text": {
+          "type": "cexolocstring",
+          "value": {
+            "0": "Yes."
+          }
+        }
+      }
+    ]
+  },
+  "StartingList": {
+    "type": "list",
+    "value": [
+      {
+        "__struct_id": 0,
+        "Active": {
+          "type": "resref",
+          "value": ""
+        },
+        "ConditionParams": {
+          "type": "list",
+          "value": []
+        },
+        "Index": {
+          "type": "dword",
+          "value": 0
+        }
+      }
+    ]
+  }
+}
diff --git a/_module/git/ranzfarmhouse.git.json b/_module/git/ranzfarmhouse.git.json
index fd62e9d3..971b60ff 100644
--- a/_module/git/ranzfarmhouse.git.json
+++ b/_module/git/ranzfarmhouse.git.json
@@ -511,7 +511,7 @@
               },
               "CR": {
                 "type": "float",
-                "value": 0.25
+                "value": 0.3333333432674408
               },
               "ResRef": {
                 "type": "resref",
@@ -5633,6 +5633,10 @@
                 "type": "resref",
                 "value": "cnrsalt"
               },
+              "xModelPart1": {
+                "type": "word",
+                "value": 14
+              },
               "XOrientation": {
                 "type": "float",
                 "value": 0.0
@@ -5966,6 +5970,10 @@
                 "type": "resref",
                 "value": "cnrsalt"
               },
+              "xModelPart1": {
+                "type": "word",
+                "value": 14
+              },
               "XOrientation": {
                 "type": "float",
                 "value": 0.0
@@ -6299,6 +6307,10 @@
                 "type": "resref",
                 "value": "cnrsugar"
               },
+              "xModelPart1": {
+                "type": "word",
+                "value": 14
+              },
               "XOrientation": {
                 "type": "float",
                 "value": 0.0
@@ -6632,6 +6644,10 @@
                 "type": "resref",
                 "value": "cnrsugar"
               },
+              "xModelPart1": {
+                "type": "word",
+                "value": 14
+              },
               "XOrientation": {
                 "type": "float",
                 "value": 0.0
@@ -7460,6 +7476,10 @@
                       "type": "resref",
                       "value": "cnryeastbakers"
                     },
+                    "xModelPart1": {
+                      "type": "word",
+                      "value": 47
+                    },
                     "XOrientation": {
                       "type": "float",
                       "value": 0.0
@@ -7565,6 +7585,10 @@
                       "type": "resref",
                       "value": "cnryeastbrewers"
                     },
+                    "xModelPart1": {
+                      "type": "word",
+                      "value": 35
+                    },
                     "XOrientation": {
                       "type": "float",
                       "value": 0.0
@@ -7700,6 +7724,10 @@
                       "type": "resref",
                       "value": "cnrbucketempty"
                     },
+                    "xModelPart1": {
+                      "type": "word",
+                      "value": 2
+                    },
                     "XOrientation": {
                       "type": "float",
                       "value": 0.0
diff --git a/_module/itp/creaturepalcus.itp.json b/_module/itp/creaturepalcus.itp.json
index 82b462fe..9b4d20cc 100644
--- a/_module/itp/creaturepalcus.itp.json
+++ b/_module/itp/creaturepalcus.itp.json
@@ -691,6 +691,25 @@
                 "value": 16966234
               }
             },
+            {
+              "__struct_id": 0,
+              "CR": {
+                "type": "float",
+                "value": 0.3333333432674408
+              },
+              "FACTION": {
+                "type": "cexostring",
+                "value": "Ranzington"
+              },
+              "NAME": {
+                "type": "cexostring",
+                "value": "Old Mary"
+              },
+              "RESREF": {
+                "type": "resref",
+                "value": "oldwoman001"
+              }
+            },
             {
               "__struct_id": 0,
               "LIST": {
@@ -30637,25 +30656,6 @@
                       "value": "nori"
                     }
                   },
-                  {
-                    "__struct_id": 0,
-                    "CR": {
-                      "type": "float",
-                      "value": 0.3333333432674408
-                    },
-                    "FACTION": {
-                      "type": "cexostring",
-                      "value": "Ranzington"
-                    },
-                    "NAME": {
-                      "type": "cexostring",
-                      "value": "Old Mary"
-                    },
-                    "RESREF": {
-                      "type": "resref",
-                      "value": "oldwoman001"
-                    }
-                  },
                   {
                     "__struct_id": 0,
                     "CR": {
diff --git a/_module/ncs/displ_onspawn.ncs b/_module/ncs/displ_onspawn.ncs
index 0ef8b72c..7ec5ed6f 100644
Binary files a/_module/ncs/displ_onspawn.ncs and b/_module/ncs/displ_onspawn.ncs differ
diff --git a/_module/ncs/dlgx_mark_select.ncs b/_module/ncs/dlgx_mark_select.ncs
index 8cd6d1b1..34c55f57 100644
Binary files a/_module/ncs/dlgx_mark_select.ncs and b/_module/ncs/dlgx_mark_select.ncs differ
diff --git a/_module/ncs/hcrh_setbonusxp.ncs b/_module/ncs/hcrh_setbonusxp.ncs
index dd82613d..8da25edf 100644
Binary files a/_module/ncs/hcrh_setbonusxp.ncs and b/_module/ncs/hcrh_setbonusxp.ncs differ
diff --git a/_module/ncs/hcrh_setbrntorch.ncs b/_module/ncs/hcrh_setbrntorch.ncs
index 24880d35..2fc98c6b 100644
Binary files a/_module/ncs/hcrh_setbrntorch.ncs and b/_module/ncs/hcrh_setbrntorch.ncs differ
diff --git a/_module/ncs/light_decay.ncs b/_module/ncs/light_decay.ncs
index af73a020..33f6250e 100644
Binary files a/_module/ncs/light_decay.ncs and b/_module/ncs/light_decay.ncs differ
diff --git a/_module/ncs/ranzisnotfree.ncs b/_module/ncs/ranzisnotfree.ncs
index 1d6c7e13..2c713f44 100644
Binary files a/_module/ncs/ranzisnotfree.ncs and b/_module/ncs/ranzisnotfree.ncs differ
diff --git a/_module/ncs/trap_on_unacq.ncs b/_module/ncs/trap_on_unacq.ncs
index 91426480..c01ddb7d 100644
Binary files a/_module/ncs/trap_on_unacq.ncs and b/_module/ncs/trap_on_unacq.ncs differ
diff --git a/_module/utc/oldwoman001.utc.json b/_module/utc/oldwoman001.utc.json
index 33963a5d..1aa792b2 100644
--- a/_module/utc/oldwoman001.utc.json
+++ b/_module/utc/oldwoman001.utc.json
@@ -42,7 +42,7 @@
   },
   "Conversation": {
     "type": "resref",
-    "value": "store016"
+    "value": "cv_oldmary"
   },
   "CRAdjust": {
     "type": "int",
@@ -62,7 +62,9 @@
   },
   "Description": {
     "type": "cexolocstring",
-    "value": {}
+    "value": {
+      "0": "This older lady has a considerable amount of flour on her apron."
+    }
   },
   "Dex": {
     "type": "byte",