diff --git a/src/persian/ResPes.gf b/src/persian/ResPes.gf
index 7d5768a9..ad425a2f 100644
--- a/src/persian/ResPes.gf
+++ b/src/persian/ResPes.gf
@@ -205,10 +205,14 @@ oper
         _ => showVPH (VSubj Pos agr) agr vp
     } ;
 
-  insertAdV : Str -> VPH -> VPH = \ad,vp -> vp ** {
+  insertAdv : Str -> VPH -> VPH = \ad,vp -> vp ** {
     ad = vp.ad ++ ad ;
   } ;
 
+  insertAdV : Str -> VPH -> VPH = \ad,vp -> vp ** {
+    ad = ad ++ vp.ad ;
+  } ;
+
   conjThat : Str = "که" ;
 
 ---------------------------
diff --git a/src/persian/StructuralPes.gf b/src/persian/StructuralPes.gf
index e4d0c1fd..01ae0790 100644
--- a/src/persian/StructuralPes.gf
+++ b/src/persian/StructuralPes.gf
@@ -101,7 +101,7 @@ concrete StructuralPes of Structural = CatPes **
   youSg_Pron = R.agr2pron ! Ag Sg P2 ;
   youPl_Pron = R.agr2pron ! Ag Pl P2 ;
   youPol_Pron = R.agr2pron ! Ag Pl P2  ;
-  no_Quant = mkQuant "هیچ" "هیچ" ;
+  no_Quant = mkQuant "هیچ" "هیچ" ; -- TODO: takes object in clitic form + is always singular
   not_Predet = {s="نه"} ;
   if_then_Conj = sd2 "اگر" "آنگاه" ** {n = Sg} ;
   at_least_AdN = ss "حداقل" ;
diff --git a/src/persian/VerbPes.gf b/src/persian/VerbPes.gf
index 50a03714..12217937 100644
--- a/src/persian/VerbPes.gf
+++ b/src/persian/VerbPes.gf
@@ -54,7 +54,7 @@ concrete VerbPes of Verb = CatPes ** open ResPes,Prelude in {
   VPSlashPrep vp prep = vp ** vs prep ;
 
 
-    AdvVP vp adv = insertAdV adv.s vp ;
+    AdvVP vp adv = insertAdv adv.s vp ;
     AdVVP adv vp = insertAdV adv.s vp ;
     ReflVP = insertCompPre reflPron ;
     PassV2 = passV ;
@@ -64,6 +64,7 @@ concrete VerbPes of Verb = CatPes ** open ResPes,Prelude in {
     CompAdv adv = {s = \\_ => adv.s} ;
 
     -- see https://sites.la.utexas.edu/persian_online_resources/nouns/noun-in-a-predicative-position/
+    -- TODO: extend this to all verbs, when NP is indefinite
     CompCN cn = {
       s = \\a => cn.s ! giveNumber a
                       ! case cn.hasAdj of {