diff --git a/lib/src/translator/DictionaryJpn.gf b/lib/src/translator/DictionaryJpn.gf
index bf4fecae8..073b5ef44 100644
--- a/lib/src/translator/DictionaryJpn.gf
+++ b/lib/src/translator/DictionaryJpn.gf
@@ -8355,6 +8355,7 @@ lin ode_N = mkN "頌歌" | mkN "オード" ;
 lin odometer_N = mkN "オドメーター" ; 
 lin odour_N = mkN "匂い" ; 
 lin oesophagus_N = mkN "食道" ; 
+lin of_Prep = S.possess_Prep ;
 lin off_A = mkA "校外" ; 
 lin offal_N = mkN "臓物" | mkN "もつ" ;  
 lin offend_V = mkV "怒らせる" ; 
diff --git a/lib/src/translator/todo/TopDictionaryJpn.gf b/lib/src/translator/todo/TopDictionaryJpn.gf
index e8355753e..872f8ec8d 100644
--- a/lib/src/translator/todo/TopDictionaryJpn.gf
+++ b/lib/src/translator/todo/TopDictionaryJpn.gf
@@ -1,12 +1,12 @@
 concrete TopDictionaryJpn of TopDictionary = CatJpn, ResJpn[VerbGroup] ** open
   ParadigmsJpn, 
-  (S = StructuralJpn),
+  (S = SyntaxJpn),
   (L = LexiconJpn)
 in {
 
 flags coding = utf8 ;
 
-lin of_Prep = variants{} ; -- 
+lin of_Prep = S.possess_Prep ; ----
 lin and_Conj = S.and_Conj | mkConj "然して" ;
 lin in_Prep = S.in_Prep ;
 lin have_VV = mkVV "持つ" | mkVV "ある" | mkVV "いる" ;
@@ -16,23 +16,23 @@ lin it_Pron = S.it_Pron ;
 lin to_Prep = S.to_Prep ;
 lin for_Prep = S.for_Prep ;
 lin i_Pron = S.i_Pron ;
-lin iFem_Pron = variants{} ; -- 
+lin iFem_Pron = S.i_Pron ; ----
 lin that_Subj = S.that_Subj ;
 lin he_Pron = S.he_Pron ;
 lin on_Prep = S.on_Prep ;
 lin with_Prep = S.with_Prep ;
 lin do_V2 = mkV2 "する" | mkV2 "やる" | mkV2 "なさる" | mkV2 "致す" ;
-lin at_Prep = variants{} ; -- 
-lin by_Prep = variants{} ; -- 
+lin at_Prep = S.on_Prep ; ----
+lin by_Prep = S.by8means_Prep ;
 lin but_Conj = mkConj "が" | mkConj "でも" ;
 lin from_Prep = S.from_Prep ;
 lin they_Pron = S.they_Pron ;
-lin theyFem_Pron = variants{} ; -- 
+lin theyFem_Pron = S.they_Pron ; ----
 lin she_Pron = S.she_Pron ;
 lin or_Conj = S.or_Conj | mkConj "または" | mkConj "あるいは" | mkConj "か" | mkConj "それとも" ;
-lin as_Subj = variants{} ; -- 
+lin as_Subj = S.when_Subj ; ----
 lin we_Pron = S.we_Pron ;
-lin weFem_Pron = variants{} ; -- 
+lin weFem_Pron = S.we_Pron ; ----
 lin say_VS = L.say_VS | mkVS "いとまごいをする" | mkVS "別れを告げる" | mkVS "告別する" ;
 lin say_V2 = mkV2 "いとまごいをする" | mkV2 "別れを告げる" | mkV2 "告別する" ;
 lin say_V = mkV "いとまごいをする" | mkV "別れを告げる" | mkV "告別する" ;
@@ -58,13 +58,12 @@ lin know_VS = L.know_VS | mkVS "...を知っている" | mkVS "...に精通し
 lin know_VQ = L.know_VQ | mkVQ "...を知っている" | mkVQ "...に精通している" ;
 lin know_V2 = L.know_V2 | mkV2 "...を知っている" | mkV2 "...に精通している" ;
 lin know_V = mkV "...を知っている" | mkV "...に精通している" ;
-lin time_N = mkN "時限爆弾" ;
-lin time_2_N = variants{} ; -- 
-lin time_1_N = variants{} ; -- 
+lin time_2_N = mkN "時限爆弾" ; ----
+lin time_1_N = mkN "時限爆弾" ; ----
 lin take_V2 = mkV2 "気を付ける" ;
 lin so_Adv = mkAdv "今まで" | mkAdv "これまで" | mkAdv "これまでのところ" ;
 lin year_N = L.year_N | mkN "学年" ;
-lin into_Prep = variants{} ; -- 
+lin into_Prep = S.to_Prep ; ----
 lin then_Adv = mkAdv "その時" | mkAdv "その時点" ;
 lin think_VS = mkVS "考える" | mkVS "意図する" ;
 lin think_V2 = mkV2 "考える" | mkV2 "意図する" ;
@@ -74,9 +73,8 @@ lin than_Subj = variants{} ; --
 lin more_Adv = mkAdv "ますます" | mkAdv "更に" ;
 lin about_Prep = S.on_Prep ;
 lin now_Adv = L.now_Adv | mkAdv "今" ;
-lin last_A = mkA "最後" | mkA "最終的" | mkA "終わり" ;
-lin last_1_A = variants{} ; -- 
-lin last_2_A = variants{} ; -- 
+lin last_1_A = mkA "最後" | mkA "最終的" | mkA "終わり" ; ----
+lin last_2_A = mkA "最後" | mkA "最終的" | mkA "終わり" ; ----
 lin other_A = mkA "他の" | mkA "別の" ;
 lin give_V3 = L.give_V3 | mkV3 "あげる" | mkV3 "下さる" | mkV3 "差し上げる" | mkV3 "くれる" ;
 lin give_V2 = mkV2 "あげる" | mkV2 "下さる" | mkV2 "差し上げる" | mkV2 "くれる" ;
@@ -84,13 +82,13 @@ lin give_V = mkV "あげる" | mkV "下さる" | mkV "差し上げる" | mkV "
 lin just_Adv = mkAdv "念のため" ;
 lin people_N = mkN "人々" | mkN "人達" | mkN "人" ;
 lin also_Adv = mkAdv "も" | mkAdv "また" | mkAdv "さらに" | mkAdv "にも" ;
-lin well_Adv = variants{} ; -- 
-lin only_Adv = mkAdv "...だけ" ;
+lin well_Adv = S.mkAdv L.good_A ; ----
+lin only_Adv = mkAdv "だけ" ;
 lin new_A = L.new_A | mkA "新しい" ;
 lin when_Subj = S.when_Subj ;
 lin way_N = mkN "入り口" ;
-lin way_2_N = variants{} ; -- 
-lin way_1_N = variants{} ; -- 
+lin way_2_N = mkN "入り口" ; ----
+lin way_1_N = mkN "入り口" ; ----
 lin look_VA = mkVA "見える" ;
 lin look_V2 = mkV2 "見る" | mkV2 "世話をする" | mkV2 "面倒を見る" ;
 lin look_V = mkV "世話をする" | mkV "面倒を見る" ;