Index: incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x
===================================================================
--- incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x	(revision 81124)
+++ incubator/apertium-fao-nor/apertium-fao-nor.fao-nob.t1x	(revision 81128)
@@ -133,6 +133,9 @@
     <def-attr n="a_adv">
       <attr-item tags="adv"/>
     </def-attr>
+    <def-attr n="a_sbj">
+      <attr-item tags="sbj"/>
+    </def-attr>
     <def-attr n="a_cmp">
       <attr-item tags="cmp"/>
     </def-attr>
@@ -519,8 +522,6 @@
 	</rule>
 
 
-
-
     <rule comment="REGLA: NOM">
       <pattern>
         <pattern-item n="nom"/>
@@ -538,6 +539,8 @@
         	<let><clip pos="1" side="tl" part="a_def"/><lit-tag v="gen"/></let>
       		<let><clip pos="1" side="tl" part="a_cas"/><lit-tag v="ind"/></let>
           </when>
+      	</choose>
+      	<choose>
       	  <when>
             <test>
               <equal><clip pos="1" side="tl" part="a_sp"/><lit-tag v="sp"/></equal>
@@ -805,6 +808,12 @@
 	    <call-macro n="verb_stuff1">
           <with-param pos="1"/>
         </call-macro>
+        <choose>
+          <when>
+    		<test><equal><clip pos="1" side="sl" part="a_sbj"/><lit-tag v="sbj"/></equal></test>
+    		<let><clip pos="1" side="tl" part="tags"/><lit-tag v="vblex.imp"/></let>
+  		  </when>
+  		</choose>
 	    <out>
 	      <chunk name="v" case="caseFirstWord">
             <tags>
@@ -1003,6 +1012,12 @@
 	    <let><clip pos="1" side="tl" part="a_num"/><lit-tag v="sp"/></let>
 		<let><clip pos="1" side="tl" part="a_def"/><lit-tag v="def"/></let>
 		<let><clip pos="1" side="tl" part="a_cas"/><lit v=""/></let>
+		<choose>
+ 		  <when>
+    		<test><equal><clip pos="1" side="tl" part="a_adv"/><lit-tag v="adv"/></equal></test>
+    		<let><clip pos="1" side="tl" part="tags"/><lit-tag v="det.dem.nt.sp.def"/></let>
+  		  </when>
+  		</choose>
 	    <call-macro n="f_default1"><with-param pos="1"/></call-macro>
 	    <out>
 	      <chunk name="samur" case="caseFirstWord">
@@ -1045,13 +1060,18 @@
 	</rule>
 	
 	
-
-	<rule comment="REMOVE adj stuff">
+	<rule comment="adj stuff">
 	  <pattern>
 	  	<pattern-item n="adj"/>
 	  </pattern>
 	  <action>
 	    <call-macro n="f_adj_infl1"><with-param pos="1"/></call-macro>
+	    <choose>
+          <when>
+    		<test><equal><clip pos="1" side="tl" part="tags"/><lit-tag v="adj.sint.sup.ind"/></equal></test>
+    		<let><clip pos="1" side="tl" part="tags"/><lit-tag v="adj.sint.sup.un.sp.ind"/></let>
+  		  </when>
+  		</choose>
 	    <out>
 	      <chunk name="a" case="caseFirstWord">
             <tags>
@@ -1076,6 +1096,12 @@
 	    <call-macro n="rm_gender_from_plurals_and_case">
           <with-param pos="1"/>
         </call-macro>
+        <choose>
+          <when>
+    		<test><equal><clip pos="1" side="tl" part="lem"/><lit v="tre"/></equal></test>
+    		<let><clip pos="1" side="tl" part="tags"/><lit-tag v="det.qnt.un.pl"/></let>
+  		  </when>
+  		</choose>
 	    <out>
 	      <chunk name="z" case="caseFirstWord">
             <tags>
@@ -1089,6 +1115,7 @@
 	  </action>
 	</rule>
 
+
 	<rule comment="prn-ref stuff">
 	  <pattern>
 	  	<pattern-item n="prn-ref"/>
Index: incubator/apertium-fao-nor/apertium-fao-nor.fao-nor.dix
===================================================================
--- incubator/apertium-fao-nor/apertium-fao-nor.fao-nor.dix	(revision 81124)
+++ incubator/apertium-fao-nor/apertium-fao-nor.fao-nor.dix	(revision 81128)
@@ -249,7 +249,7 @@
 <e><p><l>átta<s n="num"/></l> <r>åtte<s n="det"/><s n="qnt"/><s n="un"/><s n="pl"/></r></p></e>
 <e><p><l>níggju<s n="num"/></l> <r>ni<s n="det"/><s n="qnt"/><s n="un"/><s n="pl"/></r></p></e>
 <e><p><l>tíggju<s n="num"/></l> <r>ti<s n="det"/><s n="qnt"/><s n="un"/><s n="pl"/></r></p></e>
-<e><p><l>ellivu<s n="num"/></l> <r>elv<s n="det"/><s n="qnt"/><s n="un"/><s n="pl"/></r></p></e>
+<e><p><l>ellivu<s n="num"/></l> <r>elleve<s n="det"/><s n="qnt"/><s n="un"/><s n="pl"/></r></p></e>
 <!--<e><p><l>trettan<s n="num"/></l> <r>elv<s n="det"/><s n="qnt"/><s n="un"/><s n="pl"/></r></p></e>-->
 <!--<e><p><l>fjúrtan<s n="num"/></l> <r>elv<s n="det"/><s n="qnt"/><s n="un"/><s n="pl"/></r></p></e>-->
 <!--<e><p><l>fimtan<s n="num"/></l> <r>elv<s n="det"/><s n="qnt"/><s n="un"/><s n="pl"/></r></p></e>-->
@@ -16282,7 +16282,6 @@
 <e><p><l>skúrur<s n="n" /><s n="nt" /></l><r>leskur<s n="n" /><s n="nt" /></r></p></e>
 <e><p><l>slag<s n="n" /><s n="nt" /></l><r>anslag<s n="n" /><s n="nt" /></r></p></e>
 <e><p><l>slag<s n="n" /><s n="nt" /></l><r>slag<s n="n" /><s n="nt" /></r></p></e>
-<e><p><l>slag<s n="n" /><s n="nt" /></l><r>svart<s n="n" /><s n="nt" /><s n="sp" /></r></p></e>
 <e><p><l>slag<s n="n" /><s n="nt" /></l><r>deis<s n="n" /><s n="m" /></r></p></e>
 <e><p><l>slagborð<s n="n" /><s n="nt" /></l><r>slagbord<s n="n" /><s n="nt" /></r></p></e>
 <e><p><l>slang<s n="n" /><s n="nt" /></l><r>slang<s n="n" /><s n="m" /></r></p></e>
Index: languages/apertium-nob/apertium-nob.nob.dix
===================================================================
--- languages/apertium-nob/apertium-nob.nob.dix	(revision 81124)
+++ languages/apertium-nob/apertium-nob.nob.dix	(revision 81128)
@@ -14354,6 +14354,7 @@
 <e lm="f.Kr">            <i>f.Kr</i><par n="dagevis__adv"/></e>
 <e lm="f.eks.">          <i>f.eks.</i><par n="dagevis__adv"/></e>
 <e lm="f.eks">           <i>f.eks</i><par n="dagevis__adv"/></e>
+<e lm="t.eks">           <i>t.eks.</i><par n="dagevis__adv"/></e>
 <e lm="bla.">            <i>bla.</i><par n="dagevis__adv"/></e>
 <e lm="bl.a">            <i>bl.a</i><par n="dagevis__adv"/></e>
 <e lm="bl.a.">           <i>bl.a.</i><par n="dagevis__adv"/></e>
@@ -204971,7 +204972,6 @@
 <e lm="Grønland"> <i>Grønland</i><par n="Noreg__np"/></e>
 <e lm="Hvalba"> <i>Hvalba</i><par n="Noreg__np"/></e>
 <e lm="Høydal"> <i>Høydal</i><par n="Noreg__np"/></e>
-<e lm="Island"> <i>Island</i><par n="Noreg__np"/></e>
 <e lm="Kalsoy"> <i>Kalsoy</i><par n="Noreg__np"/></e>
 <e lm="København"> <i>København</i><par n="Noreg__np"/></e>
 <e lm="Norden"> <i>Norden</i><par n="Noreg__np"/></e>