diff --git a/lib/src/finnish/stemmed/ParseFin.gf b/lib/src/finnish/stemmed/ParseFin.gf
index 029a23cef..a4ce9f2ce 100644
--- a/lib/src/finnish/stemmed/ParseFin.gf
+++ b/lib/src/finnish/stemmed/ParseFin.gf
@@ -1,4 +1,4 @@
---# -path=.:..:../../abstract:../../common:../../english:../kotus
+--# -path=.:..:../../abstract:../../common:../../api:../../english:../kotus
 
 concrete ParseFin of ParseEngAbs = 
   TenseX, ---- - [Pol, PNeg, PPos],
@@ -21,7 +21,7 @@ concrete ParseFin of ParseEngAbs =
       VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV]
  , DictEngFin 
 ** 
-open MorphoFin, ResFin, ParadigmsFin, SyntaxFin, StemFin, Prelude in {
+open MorphoFin, ResFin, ParadigmsFin, SyntaxFin, StemFin, (E = ExtraFin), Prelude in {
 
 flags literal=Symb ; coding = utf8 ;
 
@@ -68,7 +68,7 @@ lin
   PredVPosv np vp = mkCl np vp ; ----
 
   -- Ant -> Pol -> VPSlash -> RS ; --- here replaced by a relative clause 
-  PastPartRS ant pol vps = mkRS ant pol (mkRCl which_RP (passVPSlash (lin VPSlash vps))) ;
+  PastPartRS ant pol vps = mkRS ant pol (mkRCl which_RP (E.PassVPSlash (lin VPSlash vps))) ;
 
   ApposNP np1 np2 = {
       s = \\c => np1.s ! c ++ "," ++ np2.s ! c ;
diff --git a/src/ui/android/res/xml/inflection_fi.xml b/src/ui/android/res/xml/inflection_fi.xml
deleted file mode 100644
index a454b8c39..000000000
--- a/src/ui/android/res/xml/inflection_fi.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html> <head>
-<title></title>
-</head>
-
-<body>
-<h1></h1>
-
-
-			<h1>Substantiivi</h1>
-			<table class="forms-table" rules="all" border="yes">
-				<tr>
-					<th></th>
-					<th>yksikkö</th>
-					<th>monikko</th>
-				</tr>
-				<tr>
-					<th>nominatiivi</th>
-					<td><form>s NCase Sg Nom</form></td>
-					<td><form>s NCase Pl Nom</form></td>
-				</tr>
-				<tr>
-					<th>genetiivi</th>
-					<td><form>s NCase Sg Gen</form></td>
-					<td><form>s NCase Pl Gen</form></td>
-				</tr>
-				<tr>
-					<th>partitiivi</th>
-					<td><form>s NCase Sg Part</form></td>
-					<td><form>s NCase Pl Part</form></td>
-				</tr>
-				<tr>
-					<th>translatiivi</th>
-					<td><form>s NCase Sg Transl</form></td>
-					<td><form>s NCase Pl Transl</form></td>
-				</tr>
-				<tr>
-					<th>essiivi</th>
-					<td><form>s NCase Sg Ess</form></td>
-					<td><form>s NCase Pl Ess</form></td>
-				</tr>
-				<tr>
-					<th>inessiivi</th>
-					<td><form>s NCase Sg Iness</form></td>
-					<td><form>s NCase Pl Iness</form></td>
-				</tr>
-				<tr>
-					<th>elatiivi</th>
-					<td><form>s NCase Sg Elat</form></td>
-					<td><form>s NCase Pl Elat</form></td>
-				</tr>
-				<tr>
-					<th>illatiivi</th>
-					<td><form>s NCase Sg Illat</form></td>
-					<td><form>s NCase Pl Illat</form></td>
-				</tr>
-				<tr>
-					<th>adessiivi</th>
-					<td><form>s NCase Sg Adess</form></td>
-					<td><form>s NCase Pl Adess</form></td>
-				</tr>
-				<tr>
-					<th>ablatiivi</th>
-					<td><form>s NCase Sg Ablat</form></td>
-					<td><form>s NCase Pl Ablat</form></td>
-				</tr>
-				<tr>
-					<th>allatiivi</th>
-					<td><form>s NCase Sg Allat</form></td>
-					<td><form>s NCase Pl Allat</form></td>
-				</tr>
-				<tr>
-					<th>abessiivi</th>
-					<td><form>s NCase Sg Abess</form></td>
-					<td><form>s NCase Pl Abess</form></td>
-				</tr>
-				<tr>
-					<th>komitatiivi</th>
-					<td colspan="2"><form>s NComit</form></td>
-				</tr>
-				<tr>
-					<th>instruktiivi</th>
-					<td colspan="2"><form>s NInstruct</form></td>
-				</tr>
-			</table>
-
-
-
-			<h1>Verbi</h1>
-			<h2>Finiittimuodot</h2>
-			<table class="forms-table" rules="all" border="yes">
-				<tr>
-				        <th colspan="2">aktiivi</th>
-					<th>preesens</th>
-					<th>imperfekti</th>
-					<th>konditionaali</th>
-					<th>potentiaali</th>
-					<th>imperatiivi</th>
-				</tr>
-				<tr>
-				        <th rowspan="3">yksikkö</th>
-					<th>1. persoona</th>
-					<td><form>s Presn Sg P1</form></td>
-					<td><form>s Impf Sg P1</form></td>
-					<td><form>s Condit Sg P1</form></td>
-					<td><form>s Potent Sg P1</form></td>
-					<td>-</td>
-				</tr>
-				<tr>
-					<th>2. persoona</th>
-					<td><form>s Presn Sg P2</form></td>
-					<td><form>s Impf Sg P2</form></td>
-					<td><form>s Condit Sg P2</form></td>
-					<td><form>s Potent Sg P2</form></td>
-					<td><form>s Imper Sg</form></td>
-				</tr>
-				<tr>
-					<th>3. persoona</th>
-					<td><form>s Presn Sg P3</form></td>
-					<td><form>s Impf Sg P3</form></td>
-					<td><form>s Condit Sg P3</form></td>
-				        <td><form>s Potent Sg P3</form></td>
-					<td><form>s ImperP3 Sg </form></td>
-				</tr>
-				<tr>
-				        <th rowspan="4">monikko</th>
-					<th>1. persoona</th>
-					<td><form>s Presn Pl P1</form></td>
-					<td><form>s Impf Pl P1</form></td>
-					<td><form>s Condit Pl P1</form></td>
-					<td><form>s Potent Pl P1</form></td>
-					<td><form>s ImperP1Pl</form></td>
-				</tr>
-				<tr>
-					<th>2. persoona</th>
-					<td><form>s Presn Pl P2</form></td>
-					<td><form>s Impf Pl P2</form></td>
-					<td><form>s Condit Pl P2</form></td>
-					<td><form>s Potent Pl P2</form></td>
-					<td><form>s Imper Pl</form></td>
-				</tr>
-				<tr>
-					<th>3. persoona</th>
-					<td><form>s Presn Pl P3</form></td>
-					<td><form>s Impf Pl P3</form></td>
-					<td><form>s Condit Pl P3</form></td>
-					<td><form>s Potent Pl P3</form></td>
-					<td><form>s ImperP3 Pl</form></td>
-				</tr>
-				<tr>
-					<th>kielteinen</th>
-					<td><form>s Imper Sg</form></td>
-					<td><form>s PastPartAct (AN (NCase Pl Nom))</form></td>
-					<td><form>s Condit Sg P3</form></td>
-					<td><form>s PotentNeg</form></td>
-					<td><form>s ImperNegPl</form></td>
-				</tr>
-				<tr>
-				        <th rowspan="2">passiivi</th>
-				        <th>myönteinen</th>
-					<td><form>s PassPresn True</form></td>
-					<td><form>s PassImpf True</form></td>
-					<td><form>s PassCondit True</form></td>
-					<td><form>s PassPotent True</form></td>
-					<td><form>s PassImper True</form></td>
-				</tr>
-				<tr>
-				        <th>kielteinen</th>
-					<td><form>s PassPresn False</form></td>
-					<td><form>s PassImpf False</form></td>
-					<td><form>s PassCondit False</form></td>
-					<td><form>s PassPotent False</form></td>
-					<td><form>s PassImper False</form></td>
-				</tr>
-
-			      </table>
-
-			<h2>Nominaalimuodot</h2>
-
-			<table class="forms-table" rules="all" border="yes">
-				<tr>
-				        <th rowspan="15">infinitiivi</th>
-					<th rowspan="2">1.</th>
-                                        <th>lyhyt</th>
-					<td><form>s Inf Inf1</form></td>
-				</tr>
-				<tr>
-                                        <th>pitkä</th>
-					<td><form>s Inf Inf1Long</form>ni</td>
-				</tr>
-				<tr>
-					<th rowspan="2">2. aktiivi</th>
-					<th>inessiivi</th>
-					<td><form>s Inf Inf2Iness</form></td>
-				</tr>
-				<tr>
-					<th>instruktiivi</th>
-					<td><form>s Inf Inf2Instr</form></td>
-				</tr>
-				<tr>
-					<th rowspan="1">2. passiivi</th>
-					<th>inessiivi</th>
-					<td><form>s Inf Inf2InessPass</form></td>
-				</tr>
-				<tr>
-					<th rowspan="6">3. aktiivi</th>
-					<th>inessiivi</th>
-					<td><form>s Inf Inf3Iness</form></td>
-				</tr>
-				<tr>
-					<th>elatiivi</th>
-					<td><form>s Inf Inf3Elat</form></td>
-				</tr>
-				<tr>
-					<th>illatiivi</th>
-					<td><form>s Inf Inf3Illat</form></td>
-				</tr>
-				<tr>
-					<th>adessiivi</th>
-					<td><form>s Inf Inf3Adess</form></td>
-				</tr>
-				<tr>
-					<th>abessiivi</th>
-					<td><form>s Inf Inf3Abess</form></td>
-				</tr>
-				<tr>
-					<th>instruktiivi</th>
-					<td><form>s Inf Inf3Instr</form></td>
-				</tr>
-				<tr>
-					<th rowspan="1">3. passiivi</th>
-					<th>instruktiivi</th>
-					<td><form>s Inf Inf3InstrPass</form></td>
-				</tr>
-
-				<tr>
-					<th rowspan="2">4.</th>
-					<th>nominatiivi</th>
-					<td><form>s Inf Inf4Nom</form></td>
-				</tr>
-				<tr>
-					<th>partitiivi</th>
-					<td><form>s Inf Inf4Part</form></td>
-				</tr>
-				<tr>
-					<th colspan="2">5.</th>
-					<td><form>s Inf Inf5</form>ni</td>
-				</tr>
-
-				
-				<tr>
-				        <th rowspan="7">partisiippi</th>
-				        <th rowspan="2">preesens</th>
-					<th>aktiivi</th>
-					<td><form>s PastPartAct (AN (NCase Sg Nom))</form></td>
-				</tr>
-				<tr>
-					<th>passiivi</th>
-					<td><form>s PastPartPass (AN (NCase Sg Nom))</form></td>
-				</tr>
-				<tr>
-				        <th rowspan="2">perfekti</th>
-					<th>aktiivi</th>
-					<td><form>s PastPartAct (AN (NCase Sg Nom))</form></td>
-				</tr>
-				<tr>
-					<th>passiivi</th>
-					<td><form>s PastPartPass (AN (NCase Sg Nom))</form></td>
-				</tr>
-				<tr>
-				        <th colspan="2">agentti</th>
-					<td><form>s AgentPart (AN (NCase Sg Nom))</form></td>
-				</tr>
-			      </table>
-
-<hr>
-<address></address>
-<!-- hhmts start -->Last modified: Fri Nov 29 09:19:29 CET 2013 <!-- hhmts end -->
-</body> </html>

	yksikkö	monikko
nominatiivi	s NCase Sg Nom	s NCase Pl Nom
genetiivi	s NCase Sg Gen	s NCase Pl Gen
partitiivi	s NCase Sg Part	s NCase Pl Part
translatiivi	s NCase Sg Transl	s NCase Pl Transl
essiivi	s NCase Sg Ess	s NCase Pl Ess
inessiivi	s NCase Sg Iness	s NCase Pl Iness
elatiivi	s NCase Sg Elat	s NCase Pl Elat
illatiivi	s NCase Sg Illat	s NCase Pl Illat
adessiivi	s NCase Sg Adess	s NCase Pl Adess
ablatiivi	s NCase Sg Ablat	s NCase Pl Ablat
allatiivi	s NCase Sg Allat	s NCase Pl Allat
abessiivi	s NCase Sg Abess	s NCase Pl Abess
komitatiivi	s NComit
instruktiivi	s NInstruct
aktiivi		preesens	imperfekti	konditionaali	potentiaali	imperatiivi
yksikkö	1. persoona	s Presn Sg P1	s Impf Sg P1	s Condit Sg P1	s Potent Sg P1	-
	2. persoona	s Presn Sg P2	s Impf Sg P2	s Condit Sg P2	s Potent Sg P2	s Imper Sg
	3. persoona	s Presn Sg P3	s Impf Sg P3	s Condit Sg P3	s Potent Sg P3	s ImperP3 Sg
monikko	1. persoona	s Presn Pl P1	s Impf Pl P1	s Condit Pl P1	s Potent Pl P1	s ImperP1Pl
	2. persoona	s Presn Pl P2	s Impf Pl P2	s Condit Pl P2	s Potent Pl P2	s Imper Pl
	3. persoona	s Presn Pl P3	s Impf Pl P3	s Condit Pl P3	s Potent Pl P3	s ImperP3 Pl
	kielteinen	s Imper Sg	s PastPartAct (AN (NCase Pl Nom))	s Condit Sg P3	s PotentNeg	s ImperNegPl
passiivi	myönteinen	s PassPresn True	s PassImpf True	s PassCondit True	s PassPotent True	s PassImper True
passiivi	kielteinen	s PassPresn False	s PassImpf False	s PassCondit False	s PassPotent False	s PassImper False
infinitiivi	1.	lyhyt	s Inf Inf1
	1.	pitkä	s Inf Inf1Long ni
	2. aktiivi	inessiivi	s Inf Inf2Iness
	2. aktiivi	instruktiivi	s Inf Inf2Instr
	2. passiivi	inessiivi	s Inf Inf2InessPass
	3. aktiivi	inessiivi	s Inf Inf3Iness
		elatiivi	s Inf Inf3Elat
		illatiivi	s Inf Inf3Illat
		adessiivi	s Inf Inf3Adess
		abessiivi	s Inf Inf3Abess
		instruktiivi	s Inf Inf3Instr
	3. passiivi	instruktiivi	s Inf Inf3InstrPass
	4.	nominatiivi	s Inf Inf4Nom
	4.	partitiivi	s Inf Inf4Part
	5.		s Inf Inf5 ni
partisiippi	preesens	aktiivi	s PastPartAct (AN (NCase Sg Nom))
	preesens	passiivi	s PastPartPass (AN (NCase Sg Nom))
	perfekti	aktiivi	s PastPartAct (AN (NCase Sg Nom))
	perfekti	passiivi	s PastPartPass (AN (NCase Sg Nom))
	agentti		s AgentPart (AN (NCase Sg Nom))