diff --git a/dict/deconjugator.json b/dict/deconjugator.json
index 85b70a0..5a132bd 100644
--- a/dict/deconjugator.json
+++ b/dict/deconjugator.json
@@ -50,6 +50,7 @@
   "detail": "(izenkei)"
  },
  "the potential of v5r-i verbs does not use a simple e ending, it uses the ren'youkei (infinitive) followed by える, thus ありえる",
+ "stem-e is exclusively used by the ~ba form",
  {
   "type": "neverfinalrule",
   "dec_end": "る",
@@ -66,6 +67,14 @@
   "con_tag": "stem-e",
   "detail": "(izenkei)"
  },
+ {
+  "type": "neverfinalrule",
+  "dec_end": ["くる","来る"],
+  "con_end": ["くれ","来れ"],
+  "dec_tag": "vs-i",
+  "con_tag": "stem-e",
+  "detail": "(izenkei)"
+ },
  {
   "type": "neverfinalrule",
   "dec_end": "",
@@ -185,6 +194,7 @@
   "con_tag": "stem-a",
   "detail": "('a' stem)"
  },
+ "note: stem-a goes to passive, causative, AND negative. don't use it for categories with irregular behavior among these three",
  "unvoiced past stems",
  {
   "type": "neverfinalrule",
@@ -198,6 +208,8 @@
    "る",
    "う",
    "く",
+   "くる",
+   "来る",
    "する"
   ],
   "con_end": [
@@ -210,6 +222,8 @@
    "",
    "う",
    "っ",
+   "き",
+   "来",
    "し"
   ],
   "dec_tag": [
@@ -222,6 +236,8 @@
    "v1",
    "v5u-s",
    "v5k-s",
+   "vk",
+   "vk",
    "vs-i"
   ],
   "con_tag": "stem-ren-less",
@@ -266,6 +282,8 @@
    "む",
    "う",
    "く",
+   "くる",
+   "来る",
    "する"
   ],
   "con_end": [
@@ -280,6 +298,8 @@
    "み",
    "い",
    "き",
+   "き",
+   "来",
    "し"
   ],
   "dec_tag": [
@@ -294,6 +314,8 @@
    "v5m",
    "v5u-s",
    "v5k-s",
+   "vk",
+   "vk",
    "vs-i"
   ],
   "con_tag": "stem-ren",
@@ -362,6 +384,8 @@
    "る",
    "う",
    "く",
+   "くる",
+   "来る",
    "する"
   ],
   "con_end": [
@@ -378,6 +402,8 @@
    "よう",
    "おう",
    "こう",
+   "こよう",
+   "来よう",
    "しよう"
   ],
   "dec_tag": [
@@ -394,6 +420,8 @@
    "v1",
    "v5u-s",
    "v5k-s",
+   "vk",
+   "vk",
    "vs-i"
   ],
   "con_tag": "form-volition",
@@ -783,6 +811,14 @@
   "con_tag": "v1",
   "detail": "potential"
  },
+ {
+  "type": "stdrule",
+  "dec_end": ["くる", "来る"],
+  "con_end": ["これる", "来れる"],
+  "dec_tag": "vk",
+  "con_tag": "v1",
+  "detail": "potential"
+ },
  "note: ichidan (i.e. v1) verbs cannot conjugate to stem-a",
  {
   "type": "stdrule",
@@ -801,14 +837,31 @@
   "detail": "passive/potential"
  },
  {
-  "type": "stdrule",
+  "type": "rewriterule",
   "dec_end": "する",
   "con_end": "される",
   "dec_tag": "vs-i",
   "con_tag": "v1",
   "detail": "passive"
  },
+ {
+  "type": "stdrule",
+  "dec_end": ["くる", "来る"],
+  "con_end": ["こられる", "来られる"],
+  "dec_tag": "vk",
+  "con_tag": "v1",
+  "detail": "passive/potential"
+ },
  "causative",
+ {
+  "type": "contextrule",
+  "contextrule": "saspecial",
+  "dec_end": "",
+  "con_end": "す",
+  "dec_tag": "stem-a",
+  "con_tag": "v5s",
+  "detail": "short causative"
+ },
  {
   "type": "stdrule",
   "dec_end": "",
@@ -817,14 +870,6 @@
   "con_tag": "v1",
   "detail": "causative"
  },
- {
-  "type": "stdrule",
-  "dec_end": "する",
-  "con_end": "させる",
-  "dec_tag": "vs-i",
-  "con_tag": "v1",
-  "detail": "causative"
- },
  {
   "type": "stdrule",
   "dec_end": "る",
@@ -834,13 +879,20 @@
   "detail": "causative"
  },
  {
-  "type": "contextrule",
-  "contextrule": "saspecial",
-  "dec_end": "",
-  "con_end": "す",
-  "dec_tag": "stem-a",
-  "con_tag": "v5s",
-  "detail": "short causative"
+  "type": "rewriterule",
+  "dec_end": "する",
+  "con_end": "させる",
+  "dec_tag": "vs-i",
+  "con_tag": "v1",
+  "detail": "causative"
+ },
+ {
+  "type": "stdrule",
+  "dec_end": ["くる", "来る"],
+  "con_end": ["こされる", "来させる"],
+  "dec_tag": "vk",
+  "con_tag": "v1",
+  "detail": "causative"
  },
  "===te-based forms===",
  "mere te auxiliaries",
@@ -1133,7 +1185,7 @@
   "con_tag": "uninflectable",
   "detail": "slurred"
  },
- "// TODO: support for other verb types like vk (くる) (started, incomplete), vs_i (true する verbs), v5aru (なさる, くださる, etc), v4r (ござる, etc), ...",
+ "// TODO: support for other verb types like v5aru (なさる, くださる, etc), v4r (ござる, etc), ...",
  {
   "type": "substitution",
   "dec_end": [
diff --git a/dict/priority.json b/dict/priority.json
index 094a22e..19b5356 100644
--- a/dict/priority.json
+++ b/dict/priority.json
@@ -6,6 +6,7 @@
   ["", "し", 10000],
   ["", "ず", 10000],
   ["", "や", 10000],
+  ["", "より", 10000],
 
   ["", "て", 40],
 
@@ -22,6 +23,7 @@
   ["頑な", "かたくな", 40],
   ["会", "かい", 40],
   ["行く", "いく", 40],
+  ["来る", "くる", 40],
 
   ["為る", "する", 100],