diff --git a/src/croatian/AdjectiveHrv.gf b/src/croatian/AdjectiveHrv.gf
index 04f6112eb..c059fe30a 100644
--- a/src/croatian/AdjectiveHrv.gf
+++ b/src/croatian/AdjectiveHrv.gf
@@ -5,7 +5,9 @@ concrete AdjectiveHrv of Adjective = CatHrv ** open ResHrv, Prelude in {
     PositA a = adjFormsAdjective a ** {isPost = False} ;
     
     AdAP ada ap = ap ** {s = \\g,n,c => ada.s ++ ap.s ! g ! n ! c} ;
-    
+
+--AW2 AdjOrd
+
     ComplA2 a np =
       let ap = adjFormsAdjective a
       in
diff --git a/src/croatian/ExtendHrv.gf b/src/croatian/ExtendHrv.gf
index cc34f4185..46d5aeb94 100644
--- a/src/croatian/ExtendHrv.gf
+++ b/src/croatian/ExtendHrv.gf
@@ -32,7 +32,8 @@ open
   ResHrv
 in {
 
-lin ReflPossPron = justDemPronFormsAdjective reflPossessivePron ;
+---lin ReflPossPron = justDemPronFormsAdjective reflPossessivePron ;
 
+--AW2 CardCNCard
 
 }
diff --git a/src/croatian/IdiomHrv.gf b/src/croatian/IdiomHrv.gf
index 130e1b401..348216449 100644
--- a/src/croatian/IdiomHrv.gf
+++ b/src/croatian/IdiomHrv.gf
@@ -1,5 +1,6 @@
 concrete IdiomHrv of Idiom = CatHrv ** open Prelude, ResHrv in {
 
-
+--AW2 ExistNP
+--AW2 ExistNPAdv
 
 }
diff --git a/src/croatian/NounHrv.gf b/src/croatian/NounHrv.gf
index 7924c8f48..2912ab66b 100644
--- a/src/croatian/NounHrv.gf
+++ b/src/croatian/NounHrv.gf
@@ -87,6 +87,10 @@ lin
       s = \\g,c => (adjFormsAdjective nu.s).s ! g ! Sg ! c ; ---- TODO Sg?
       size = nu.size
       } ;
+      
+--AW2 AdNum
+--AW2 PossNP
+--AW2 OrdSuperl
 
 
 }
diff --git a/src/croatian/ParadigmsHrv.gf b/src/croatian/ParadigmsHrv.gf
index 7c83473c7..687dc5c0d 100644
--- a/src/croatian/ParadigmsHrv.gf
+++ b/src/croatian/ParadigmsHrv.gf
@@ -170,5 +170,7 @@ oper
   mkConj : Str -> Conj
     = \s -> lin Conj {s1 = [] ; s2 = s} ;
 
+--AW2 mkAdN
+--AW2 mkOrd
 
 }
diff --git a/src/croatian/RelativeHrv.gf b/src/croatian/RelativeHrv.gf
index 5b146cbf9..71942197b 100644
--- a/src/croatian/RelativeHrv.gf
+++ b/src/croatian/RelativeHrv.gf
@@ -12,7 +12,7 @@ lin
 	  } 
       } ;
       
-    IdRP = mkA "který" ; 
+    IdRP = mkA "koji" ; 
 
 
 }
diff --git a/src/croatian/StructuralHrv.gf b/src/croatian/StructuralHrv.gf
index b9e3ff35b..4b0344578 100644
--- a/src/croatian/StructuralHrv.gf
+++ b/src/croatian/StructuralHrv.gf
@@ -2,7 +2,7 @@ concrete StructuralHrv of Structural = CatHrv **
   open ParadigmsHrv, ResHrv, Prelude in {
 
 lin
-    and_Conj = mkConj "a" ;
+    and_Conj = mkConj "i" ;
 ----    by8agent_Prep = mkPrep "" Ins ; 
 ----    few_Det = invarNumeral "málo" ; -- see notes
     for_Prep = mkPrep "pre" accusative ;
@@ -28,4 +28,7 @@ lin
     we_Pron = mkPron (Ag (Masc Anim) Pl P1) ;
     youPl_Pron = mkPron (Ag (Masc Anim) Pl P2) ;
     they_Pron = mkPron (Ag (Masc Anim) Pl P3) ;
+
+    somewhere_Adv = mkAdv "negdje" ;
+
 }
diff --git a/src/croatian/SymbolHrv.gf b/src/croatian/SymbolHrv.gf
index 1d3a6f792..f528016c6 100644
--- a/src/croatian/SymbolHrv.gf
+++ b/src/croatian/SymbolHrv.gf
@@ -8,4 +8,8 @@ lin
   MkSymb s = s ;
   SymbPN s = lin PN {s = \\_ => s.s ; g = Neutr} ;
 
+--AW SymbolEng.IntPN
+--AW SymbolEng.SymbNum
+--AW SymbolicEng.mkSymb
+
 }
diff --git a/src/croatian/VerbHrv.gf b/src/croatian/VerbHrv.gf
index 0738926cd..472346c3e 100644
--- a/src/croatian/VerbHrv.gf
+++ b/src/croatian/VerbHrv.gf
@@ -34,7 +34,7 @@ lin
       } ;
       
     CompNP np = {
-      s = \\a_ => np.s ! Nom ; ---- InstrC in Pol
+      s = \\a_ => np.s ! Nom ;
       } ;
       
     CompAdv adv = {
diff --git a/src/croatian/aw-needed.txt b/src/croatian/aw-needed.txt
index 53c345af7..e490d5de7 100644
--- a/src/croatian/aw-needed.txt
+++ b/src/croatian/aw-needed.txt
@@ -41,7 +41,7 @@ NounEng.PossPron
 NounEng.RelCN
 NounEng.UsePron
 ParadigmsEng.mkAdN
-aradigmsEng.mkAdv
+ParadigmsEng.mkAdv
 ParadigmsEng.mkOrd
 ParadigmsEng.regA
 PhraseEng.NoPConj