diff --git a/DOC/Heritage_Platform.pdf b/DOC/Heritage_Platform.pdf
index 61bc562a8387b3016a5198dd536ee20fe8bbb06e..871ccc29cf6ad58e92352160c3fed9d8e55a210c 100644
Binary files a/DOC/Heritage_Platform.pdf and b/DOC/Heritage_Platform.pdf differ
diff --git a/DOC/Heritage_Platform.tex b/DOC/Heritage_Platform.tex
index fa1483315c1203a120a141ab38d61aa4c84ae7cd..8ad6ad0c500a689e13c320763c2a81debf66b7b1 100644
--- a/DOC/Heritage_Platform.tex
+++ b/DOC/Heritage_Platform.tex
@@ -14,9 +14,9 @@
 \vspace*{24pt}
 {\Large The Sanskrit Platform Documentation}\\[10pt]
 {\Large (Sanskrit Library V3.05; Zen toolkit V3.1)}\\[15pt] 
-{\large 2018-02-27}\\[15pt]
+{\large 2018-03-17}\\[15pt]
 {\large G\'erard Huet \& Pawan Goyal}\\[10pt]
-{\large Copyright \copyright ~2000-2017 Inria}\\[20pt]
+{\large Copyright \copyright ~2000-2018 Inria}\\[20pt]
 \end{center}
 
 % Macros
@@ -99,7 +99,7 @@ Generated by make version - see main Makefile
 \label{version.ml:671}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{version}=$\ocwstring{"3.05"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2018\symbol{45}02\symbol{45}27"};\ocweol
+$\ocwlowerid{value}~\ocwlowerid{version}=$\ocwstring{"3.05"}~\ocwkw{and}~$\ocwlowerid{version\_date}=$\ocwstring{"2018\symbol{45}03\symbol{45}17"};\ocweol
 \ocweol
 \ocwendcode{}\typeout{OcamlWeb file Date.ml}
 \ocwmodule{Date}
@@ -201,7 +201,7 @@ $\mid{}~13~\rightarrow{}~$\ocwstring{"au"}\ocweol
 \ocwindent{1.00em}
 $\mid{}~14~\rightarrow{}~$\ocwstring{".m"}~\ocwbc{} anusvaara \ocwec{}\ocweol
 \ocwindent{1.00em}
-$\mid{}~15~\rightarrow{}~$\ocwstring{"\~{}\~{}"}~\ocwbc{} anunaasika candrabindu \ocwec{}\ocweol
+$\mid{}~15~\rightarrow{}~$\ocwstring{"\~{}\~{}"}~\ocwbc{} anun\=asika candrabindu \ocwec{}\ocweol
 \ocwindent{1.00em}
 $\mid{}~16~\rightarrow{}~$\ocwstring{".h"}\ocweol
 \ocwindent{1.00em}
@@ -307,7 +307,7 @@ $\ocwlowerid{where}~\ocwlowerid{mess}~=~$\ocwstring{"Canon:\ocwvspace{}Illegal\o
 \ocwindent{16.50em}
 \ocwbc{} n-2 above since (ASCII) Char.chr 48 = '0' \ocwec{}\medskip
 
-\label{canon.ml:2652}%
+\label{canon.ml:2653}%
 \ocwindent{1.00em}
 $]$\ocweol
 \ocwindent{0.00em}
@@ -382,7 +382,7 @@ Support for other translitteration schemes
 \ocwindent{0.00em}
 Wax decoding - University of Hyderabad 
 \ocweol
-\label{canon.ml:4346}%
+\label{canon.ml:4347}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{canon\_WX}~=~$\ocwkw{fun}~\ocweol
@@ -897,7 +897,7 @@ $\mid{}~50~\rightarrow{}~$\ocwstring{"\_"}~\ocwbc{} hiatus \ocwec{}\ocweol
 \ocwindent{1.00em}
 $\mid{}~-1~\rightarrow{}~$\ocwstring{"'"}\ocweol
 \ocwindent{1.00em}
-$\mid{}~-2~\rightarrow{}~$\ocwstring{"[\symbol{45}]"}~\ocwbc{} Inconsistent with previous versions \ocwec{}\ocweol
+$\mid{}~-2~\rightarrow{}~$\ocwstring{"[\symbol{45}]"}~\ocweol
 \ocwindent{1.00em}
 $\mid{}~-3~\rightarrow{}~$\ocwstring{"A|a"}~\ocwbc{} sandhi of A and (a,A) - phantom phoneme \ocwec{}\ocweol
 \ocwindent{1.00em}
@@ -927,11 +927,11 @@ $(\ocwlowerid{canon2}~\ocwlowerid{c}~$\^{}~$\ocwlowerid{protected}~,~\ocwlowerid
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
-\ocwbc{} \ocwbegindcode{}$\ocwlowerid{decode2}~:~\ocwlowerid{word}~\rightarrow{}~$\ocwbt{string}\ocwenddcode{} \ocwec{}\ocweol
+\ocwbc{} decode2 : word -> string (debug for \ocwbegindcode{}$\ocwupperid{Morpho\_xml}$\ocwenddcode{} \ocwec{}\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{decode2}~\ocwlowerid{word}~=~$\ocweol
 \ocwindent{1.00em}
-\ocwkw{try}~\ocwkw{let}~$(\ocwlowerid{s},\ocwlowerid{\_})~=~\ocwupperid{List.}\ocwlowerid{fold\_right}~\ocwlowerid{catenate2}~\ocwlowerid{word}~($\ocwstring{""},$\ocwupperid{False})~$\ocwkw{in}~$\ocwlowerid{s}$\ocweol
+\ocwkw{try}~\ocwkw{let}~$(\ocwlowerid{s},\ocwlowerid{\_})~=~\ocwupperid{List.}\ocwlowerid{fold\_right}~\ocwlowerid{catenate2}~\ocwlowerid{word}~($\ocwstring{""},$\ocwupperid{False})~$\ocwkw{in}~$\ocwlowerid{s}~$\ocweol
 \ocwindent{1.00em}
 \ocwkw{with}~$[~\ocwupperid{Failure}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{failwith}~($\ocwstring{"decode2:\ocwvspace{}"}~\^{}~$\ocwlowerid{robust\_decode}~(\ocwupperid{Word.}\ocwlowerid{mirror}~\ocwlowerid{word}))~]$\ocweol
 \ocwindent{0.00em}
@@ -1424,7 +1424,7 @@ $\ocwlowerid{value}~\ocwlowerid{stem\_to\_string}~\ocwlowerid{html}~=$\ocweol
 \ocwindent{0.00em}
 ;\medskip
 
-\label{canon.ml:15150}%
+\label{canon.ml:15134}%
 \ocwindent{0.00em}
 \ocwkw{exception}~$\ocwupperid{Hiatus}$\ocweol
 \ocwindent{0.00em}
@@ -3987,7 +3987,7 @@ $\mid{}~\ocwlowerid{\_}~\rightarrow{}~$\ocwkw{if}~$\ocwlowerid{c}=36~$\ocwbc{} n
 \ocwindent{12.50em}
 \ocwbc{} Word.mirror \ocwbegindcode{}~32~::~$\ocwlowerid{rest}~$\ocwenddcode{} \ocwbc{} n -> t \ocwec{} \ocwec{}\ocweol
 \ocwindent{12.50em}
-\ocwbc{} incomplétude: raajan naasiin vocatif raajan \ocwec{}\ocweol
+\ocwbc{} incompleteness: raajan naasiin vocatif raajan \ocwec{}\ocweol
 \ocwindent{10.00em}
 \ocwkw{else}~$\ocwlowerid{w}$\ocweol
 \ocwindent{6.50em}
@@ -4093,6 +4093,9 @@ $]~$\ocweol
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
+\ocwbc{} Called from \ocwbegindcode{}$\ocwupperid{Sanskrit}.\ocwlowerid{read\_processed\_skt\_stream}$\ocwenddcode{} for use in \ocwbegindcode{}$\ocwlowerid{read\_sanskrit}$\ocwenddcode{}
+   with argument \ocwbegindcode{}$\ocwlowerid{read\_chunk}=\ocwlowerid{sanskrit\_chunk}~\ocwlowerid{encode}$\ocwenddcode{} \ocwec{}\ocweol
+\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{padapatha}~\ocwlowerid{read\_chunk}~\ocwlowerid{l}~=~$\ocwbc{} l is list of chunks separated by blanks \ocwec{}\ocweol
 \ocwindent{10.50em}
 \ocwbc{} returns padapatha as list of forms in terminal sandhi \ocwec{}\ocweol
@@ -4217,10 +4220,6 @@ $\ocwlowerid{value}~\ocwlowerid{code\_skt\_ref\_d}~:~\ocwlowerid{skt}~\rightarro
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{decode\_skt}~:~\ocwupperid{Word.}\ocwlowerid{word}~\rightarrow{}~\ocwlowerid{skt};$\ocweol
 \ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{read\_corpus}~:~$\ocwbt{bool}~$\rightarrow{}~\ocwlowerid{in\_channel}~\rightarrow{}~$\ocwbt{list}~$\ocwupperid{Word.}\ocwlowerid{word};$\ocweol
-\ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{read\_VH}~:~$\ocwbt{bool}~$\rightarrow{}~$\ocwbt{string}~$\rightarrow{}~$\ocwbt{list}~$\ocwupperid{Word.}\ocwlowerid{word};~$\ocweol
-\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{read\_sanskrit}~:~($\ocwbt{string}~$\rightarrow{}~\ocwupperid{Word.}\ocwlowerid{word})~\rightarrow{}~$\ocwbt{string}~$\rightarrow{}~$\ocwbt{list}~$\ocwupperid{Word.}\ocwlowerid{word};$\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{read\_raw\_sanskrit}~:~($\ocwbt{string}~$\rightarrow{}~\ocwupperid{Word.}\ocwlowerid{word})~\rightarrow{}~$\ocwbt{string}~$\rightarrow{}~$\ocwbt{list}~$\ocwupperid{Word.}\ocwlowerid{word};$\ocweol
@@ -4342,36 +4341,6 @@ $\ocwlowerid{pada}:~$\ocwbc{} non-empty list of chunks separated by blanks \ocwe
 \ocwindent{2.00em}
 $[~[~\ocwlowerid{el}~=~\ocwupperid{LIST1}~\ocwlowerid{skt}~\rightarrow{}~\ocwlowerid{el}~]~]~;~$\ocweol
 \ocwindent{1.00em}
-$\ocwlowerid{sloka\_line}:$\ocweol
-\ocwindent{2.00em}
-$[~[~\ocwlowerid{p}~=~\ocwlowerid{pada};~$\ocwstring{"|"};~\ocwstring{"|"}~$\rightarrow{}~[~\ocwlowerid{p}~]~$\ocweol
-\ocwindent{3.00em}
-$\mid{}~\ocwlowerid{p}~=~\ocwlowerid{pada};~$\ocwstring{"|"};~$\ocwlowerid{sl}~=~\ocwlowerid{sloka\_line}~\rightarrow{}~[~\ocwlowerid{p}~::~\ocwlowerid{sl}~]$\ocweol
-\ocwindent{2.00em}
-$]~]~;$\ocweol
-\ocwindent{1.00em}
-$\ocwlowerid{sloka}:~$\ocwbc{} wrong \ocwec{}\ocweol
-\ocwindent{2.00em}
-$[~[~\ocwlowerid{p}~=~\ocwlowerid{pada};~$\ocwstring{"|"};~$\ocwlowerid{sl}~=~\ocwlowerid{sloka\_line}~\rightarrow{}~[~\ocwlowerid{p}~::~\ocwlowerid{sl}~]$\ocweol
-\ocwindent{3.00em}
-$\mid{}~\ocwlowerid{p}~=~\ocwlowerid{pada}~\rightarrow{}~[~\ocwlowerid{p}~]$\ocweol
-\ocwindent{3.00em}
-$\mid{}~`\ocwupperid{EOI}~\rightarrow{}~\ocwlowerid{failwith}~$\ocwstring{"Empty\ocwvspace{}sanskrit\ocwvspace{}input"}\ocweol
-\ocwindent{2.00em}
-$]~]~;$\ocweol
-\ocwindent{1.00em}
-$\ocwlowerid{sanscrit}:~$\ocweol
-\ocwindent{2.00em}
-$[~[~\ocwlowerid{p}~=~\ocwlowerid{pada};~$\ocwstring{"|"};~\ocwstring{"|"}~$\rightarrow{}~[~\ocwlowerid{p}~]$\ocweol
-\ocwindent{3.00em}
-$\mid{}~\ocwlowerid{p}~=~\ocwlowerid{pada};~$\ocwstring{"|"};~$\ocwlowerid{sl}~=~\ocwlowerid{sanscrit}~\rightarrow{}~[~\ocwlowerid{p}~::~\ocwlowerid{sl}~]~$\ocweol
-\ocwindent{3.00em}
-$\mid{}~\ocwlowerid{p}~=~\ocwlowerid{pada};~`\ocwupperid{EOI}~\rightarrow{}~[~\ocwlowerid{p}~]$\ocweol
-\ocwindent{3.00em}
-$\mid{}~`\ocwupperid{EOI}~\rightarrow{}~\ocwlowerid{failwith}~$\ocwstring{"Empty\ocwvspace{}sanskrit\ocwvspace{}input"}\ocweol
-\ocwindent{2.00em}
-$]~]~;$\ocweol
-\ocwindent{1.00em}
 $\ocwlowerid{skt\_list}~:$\ocweol
 \ocwindent{2.00em}
 $[~[~\ocwlowerid{el}~=~\ocwupperid{LIST1}~\ocwlowerid{skt}~\ocwupperid{SEP}~$\ocwstring{","};~`$\ocwupperid{EOI}~\rightarrow{}~\ocwlowerid{el}~]~]~;$\ocweol
@@ -4406,7 +4375,7 @@ $\ocwlowerid{value}~\ocwlowerid{trad\_skt}~=~\ocwlowerid{trad\_string}~\ocwlower
 \ocwindent{0.00em}
 ;\medskip
 
-\label{sanskrit.ml:3606}%
+\label{sanskrit.ml:3698}%
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{maha\_epic}~=~$\ocwstring{"Mahaabhaarata"}~\ocwbc{} for \ocwbegindcode{}$\ocwupperid{Print\_html}$\ocwenddcode{} \ocwec{}\ocweol
 \ocwindent{1.00em}
@@ -4423,7 +4392,7 @@ $\ocwlowerid{value}~\ocwlowerid{skt\_to\_html}~=~\ocwupperid{Transduction.}\ocwl
 \ocwendcode{}\ocwindent{0.00em}
 Encoding functions skt -> word 
 \ocweol
-\label{sanskrit.ml:3950}%
+\label{sanskrit.ml:4042}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{raw\_sanskrit\_word}~=~\ocwupperid{Transduction.}\ocwlowerid{code\_raw};~$\ocwbc{} no normalisation no accent\ocwec{}~\ocweol
@@ -4443,7 +4412,7 @@ $\ocwlowerid{value}~\ocwlowerid{normal\_stem}~=~\ocwupperid{Encode.}\ocwlowerid{
 \ocwendcode{}\ocwindent{0.00em}
 Cleaning up by removing accents - used in \ocwbegindcode{}$\ocwupperid{Print\_dict}$\ocwenddcode{} 
 \ocweol
-\label{sanskrit.ml:4502}%
+\label{sanskrit.ml:4594}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{clean\_up}~\ocwlowerid{s}~=~\ocwupperid{Canon.}\ocwlowerid{decode}~(\ocwupperid{Transduction.}\ocwlowerid{code\_raw}~\ocwlowerid{s})$\ocweol
@@ -4454,7 +4423,7 @@ $\ocwlowerid{value}~\ocwlowerid{clean\_up}~\ocwlowerid{s}~=~\ocwupperid{Canon.}\
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{normal\_stem\_skt}~=~\ocwupperid{Encode.}\ocwlowerid{normal\_stem\_str};~$\ocwbc{} normalised stem as string \ocwec{}\medskip
 
-\label{sanskrit.ml:4714}%
+\label{sanskrit.ml:4806}%
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{code\_skt\_ref}~=~\ocwupperid{Encode.}\ocwlowerid{code\_skt\_ref};$\ocweol
 \ocwindent{0.00em}
@@ -4525,36 +4494,6 @@ $\ocwlowerid{where}~\ocwlowerid{concat}~\ocwlowerid{line}~\ocwlowerid{lines}~=~\
 \ocwindent{1.00em}
 $]$\ocweol
 \ocwindent{0.00em}
-;\ocweol
-\ocwindent{0.00em}
-\ocwbc{} assumes Velthuis encoding \ocwec{}\ocweol
-\ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{read\_corpus}~\ocwlowerid{unsandhied}~\ocwlowerid{chi}~=~$\ocwbc{} only used by Tagger1 \ocwec{}\ocweol
-\ocwindent{1.00em}
-\ocwkw{let}~$\ocwlowerid{encode}~=~\ocwupperid{Transduction.}\ocwlowerid{code\_raw}~$\ocwbc{} unnormalized input from stream \ocwec{}\ocweol
-\ocwindent{1.00em}
-\ocwkw{and}~$\ocwlowerid{channel}~=~\ocwupperid{Stream.}\ocwlowerid{of\_channel}~\ocwlowerid{chi}$\ocweol
-\ocwindent{1.00em}
-\ocwkw{and}~$\ocwlowerid{reader}~=~$\ocwkw{if}~$\ocwlowerid{unsandhied}~$\ocwkw{then}~$\ocwlowerid{read\_raw\_skt\_stream}~$\ocweol
-\ocwindent{14.50em}
-\ocwkw{else}~$\ocwlowerid{read\_processed\_skt\_stream}~$\ocwkw{in}\ocweol
-\ocwindent{1.00em}
-$\ocwlowerid{reader}~\ocwlowerid{encode}~\ocwlowerid{channel}$\ocweol
-\ocwindent{0.00em}
-;\ocweol
-\ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{read\_VH}~\ocwlowerid{unsandhied}~\ocwlowerid{str}~=~$\ocweol
-\ocwindent{1.00em}
-\ocwkw{let}~$\ocwlowerid{encode}~=~\ocwupperid{Encode.}\ocwlowerid{code\_string}~$\ocwbc{} normalized input from string \ocwec{}\ocweol
-\ocwindent{1.00em}
-\ocwkw{and}~$\ocwlowerid{channel}~=~\ocwupperid{Stream.}\ocwlowerid{of\_string}~\ocwlowerid{str}~$\ocweol
-\ocwindent{1.00em}
-\ocwkw{and}~$\ocwlowerid{reader}~=~$\ocwkw{if}~$\ocwlowerid{unsandhied}~$\ocwkw{then}~$\ocwlowerid{read\_raw\_skt\_stream}~$\ocweol
-\ocwindent{14.50em}
-\ocwkw{else}~$\ocwlowerid{read\_processed\_skt\_stream}~$\ocwkw{in}\ocweol
-\ocwindent{1.00em}
-$\ocwlowerid{reader}~\ocwlowerid{encode}~\ocwlowerid{channel}$\ocweol
-\ocwindent{0.00em}
 ;\medskip
 
 \ocwendcode{}\ocwindent{0.00em}
@@ -4569,7 +4508,7 @@ Assumes sandhi is not undone between chunks - spaces are not significant
 \ocwindent{0.00em}
 Generalizes \ocwbegindcode{}$\ocwlowerid{read\_VH}~\ocwupperid{False}$\ocwenddcode{} to all transliterations 
 \ocweol
-\label{sanskrit.ml:6958}%
+\label{sanskrit.ml:6417}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{read\_sanskrit}~\ocwlowerid{encode}~\ocwlowerid{str}~=~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{encode}~:~$\ocwbt{string}~$\rightarrow{}~\ocwlowerid{word}$\ocwenddcode{} \ocwec{}\ocweol
@@ -4662,7 +4601,7 @@ $\ocwlowerid{value}~$\ocwkw{rec}~$\ocwlowerid{filter}~\ocwlowerid{is\_kwd}~=~$\o
 \ocwindent{4.00em}
 $[~[:~`((\ocwupperid{KEYWORD}~\ocwlowerid{s},~\ocwlowerid{loc})~$\ocwkw{as}~$\ocwlowerid{p});~\ocwlowerid{strm}~:]~\rightarrow{}$\ocweol
 \ocwindent{6.50em}
-\ocwkw{if}~$\ocwlowerid{is\_kwd}~\ocwlowerid{s}~$\ocwkw{then}~$[:~`\ocwlowerid{p};~\ocwlowerid{filter}~\ocwlowerid{is\_kwd}~\ocwlowerid{strm}~:]$\ocweol
+\ocwkw{if}~$\ocwlowerid{is\_kwd}~\ocwlowerid{s}~\lor{}~\ocwlowerid{s}~=~$\ocwstring{"!"}~\ocwkw{then}~$[:~`\ocwlowerid{p};~\ocwlowerid{filter}~\ocwlowerid{is\_kwd}~\ocwlowerid{strm}~:]$\ocweol
 \ocwindent{6.50em}
 \ocwkw{else}~$\ocwlowerid{raise}~(\ocwupperid{Encode.In\_error}~($\ocwstring{"Undefined\ocwvspace{}token\ocwvspace{}:\ocwvspace{}"}~\^{}~$\ocwlowerid{s}))$\ocweol
 \ocwindent{4.00em}
@@ -4734,7 +4673,7 @@ $]$\ocweol
 \ocwindent{1.00em}
 ;\medskip
 
-\label{skt_lexer.ml:2377}%
+\label{skt_lexer.ml:2388}%
 \ocwindent{1.00em}
 \ocwkw{open}~$\ocwupperid{Token}$\ocweol
 \ocwindent{1.00em}
@@ -4743,7 +4682,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 The string buffering machinery - ddr + np 
 \ocweol
-\label{skt_lexer.ml:2443}%
+\label{skt_lexer.ml:2454}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{store}~\ocwlowerid{buf}~\ocwlowerid{c}~=~$\ocwkw{do}~\{~$\ocwupperid{Buffer.}\ocwlowerid{add\_char}~\ocwlowerid{buf}~\ocwlowerid{c};~\ocwlowerid{buf}~\}$\ocweol
@@ -7807,7 +7746,7 @@ $\ocwlowerid{value}~\ocwlowerid{admits\_aa}~=~$\ocwbt{ref}~$\ocwupperid{False}~$
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{morpho\_gen}~=~$\ocwbt{ref}~$\ocwupperid{True}~$\ocwbc{} morphology generation time \ocwec{}\ocweol
 \ocwindent{0.00em}
-\ocwbc{} Turn to \ocwbegindcode{}$\ocwupperid{False}$\ocwenddcode{} for cgi execution (fake conjugation and nophantoms) \ocwec{}\ocweol
+\ocwbc{} Turn to \ocwbegindcode{}$\ocwupperid{False}$\ocwenddcode{} for cgi execution (fake conjugation and no phantoms) \ocwec{}\ocweol
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
@@ -7815,7 +7754,7 @@ $\ocwlowerid{value}~\ocwlowerid{morpho\_gen}~=~$\ocwbt{ref}~$\ocwupperid{True}~$
    by \ocwbegindcode{}$\ocwupperid{Make\_nouns}$\ocwenddcode{} and are dumped as persistent global databases nouns.rem etc.
    They are also used on the fly locally by \ocwbegindcode{}$\ocwupperid{Declension}$\ocwenddcode{} and \ocwbegindcode{}$\ocwupperid{Conjugation}$\ocwenddcode{}. \ocwec{}\medskip
 
-\label{inflected.ml:1872}%
+\label{inflected.ml:1873}%
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{lexicalized\_kridantas}~=~$\ocwbt{ref}~$(\ocwupperid{Deco.}\ocwlowerid{empty}~:~\ocwupperid{Naming.}\ocwlowerid{deco\_krid})$\ocweol
 \ocwindent{0.00em}
@@ -7959,7 +7898,7 @@ $(\ocwlowerid{nouns.}\ocwlowerid{val},\ocwlowerid{pronouns.}\ocwlowerid{val},\oc
 \ocwendcode{}\ocwindent{0.00em}
 iiv forms 
 \ocweol
-\label{inflected.ml:4723}%
+\label{inflected.ml:4724}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{iivs}~=~$\ocwbt{ref}~$(\ocwupperid{Deco.}\ocwlowerid{empty}~:~\ocwlowerid{inflected\_map})$\ocweol
@@ -8201,7 +8140,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 inflected forms of participles - and more generally kridantas 
 \ocweol
-\label{inflected.ml:9003}%
+\label{inflected.ml:9004}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{parts}~=~$\ocwbt{ref}~$(\ocwupperid{Deco.}\ocwlowerid{empty}~:~\ocwlowerid{inflected\_map})$\ocweol
@@ -8461,7 +8400,7 @@ $\ocwlowerid{kama.}\ocwlowerid{val}~:=~\ocwupperid{Lexmap.}\ocwlowerid{addl}~\oc
 \ocwendcode{}\ocwindent{0.00em}
 Preverb sequences 
 \ocweol
-\label{inflected.ml:14136}%
+\label{inflected.ml:14137}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{preverbs}~=~$\ocwbt{ref}~$(\ocwupperid{Deco.}\ocwlowerid{empty}~:~\ocwupperid{Deco.}\ocwlowerid{deco}~\ocwlowerid{word})$\ocweol
@@ -8747,7 +8686,7 @@ $\mid{}~\ocwupperid{Bare}~(\ocwupperid{Krid}~\ocwlowerid{\_}~\ocwlowerid{root})~
 \ocwindent{3.50em}
 \}\medskip
 
-\label{inflected.ml:21141}%
+\label{inflected.ml:21142}%
 \ocwindent{1.50em}
 $\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{failwith}~$\ocwstring{"Unexpected\ocwvspace{}arg\ocwvspace{}to\ocwvspace{}enter\_form"}\ocweol
 \ocwindent{1.50em}
@@ -9752,7 +9691,7 @@ $\mid{}~$\ocwstring{"s.rj\#1"}~$\mid{}~$\ocwstring{"s.rp"}~$\mid{}~$\ocwstring{"
 \ocwindent{1.00em}
 $\mid{}~$\ocwstring{"snih\#1"}~$\mid{}~$\ocwstring{"snu"}~$\mid{}~$\ocwstring{"snuh\#1"}~$\mid{}~$\ocwstring{"sp.r"}~$\mid{}~$\ocwstring{"sphal"}~$\mid{}~$\ocwstring{"sphu.t"}~$\mid{}~$\ocwstring{"sphur"}~\ocweol
 \ocwindent{1.00em}
-$\mid{}~$\ocwstring{"sm.r"}~$\mid{}~$\ocwstring{"sru"}~$\mid{}~$\ocwstring{"svan"}~$\mid{}~$\ocwstring{"svap"}~$\mid{}~$\ocwstring{"svar\#1"}~$\mid{}~$\ocwstring{"svar\#2"}~$\mid{}~$\ocwstring{"ha.th"}~$\mid{}~$\ocwstring{"has"}~\ocweol
+$\mid{}~$\ocwstring{"sm.r"}~$\mid{}~$\ocwstring{"sru"}~$\mid{}~$\ocwstring{"svan"}~$\mid{}~$\ocwstring{"svap"}~$\mid{}~$\ocwstring{"svar\#1"}~$\mid{}~$\ocwstring{"svar\#2"}~$\mid{}~$\ocwstring{"ha.th"}~\ocweol
 \ocwindent{1.00em}
 $\mid{}~$\ocwstring{"haa\#1"}~$\mid{}~$\ocwstring{"hi\#2"}~$\mid{}~$\ocwstring{"hi.ms"}~$\mid{}~$\ocwstring{"h.r.s"}~$\mid{}~$\ocwstring{"hras"}~$\mid{}~$\ocwstring{"hrii\#1"}~$\mid{}~$\ocwstring{"hval"}\ocweol
 \ocwindent{1.00em}
@@ -9776,6 +9715,8 @@ $\mid{}~$\ocwstring{"maarg"}~\ocwbc{} root rather than nominal verb \ocwec{}\ocw
 \ocwindent{0.00em}
 \ocwbc{}| \ocwstring{"kaafk.s"} | \ocwstring{"han\#1"} occur also in Atma in BhG: kaafk.se hani.sye \ocwec{}\ocweol
 \ocwindent{0.00em}
+\ocwbc{}| \ocwstring{"has"}    Atma needed for hasate \ocwec{}\ocweol
+\ocwindent{0.00em}
 \ocwbc{}| \ocwstring{"a\~{}nj"} also Atma afkte | \ocwstring{"naath"} \ocwstring{"praz"} \ocwstring{"sp.rz\#1"} idem \ocwec{}\ocweol
 \ocwindent{3.00em}
 $\rightarrow{}~\ocwupperid{Para}~$\ocwbc{} active only \ocwec{}\ocweol
@@ -10025,7 +9966,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Refining with potential preverb 
 \ocweol
-\label{pada.ml:11134}%
+\label{pada.ml:11165}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{voices\_of\_pv}~\ocwlowerid{upasarga}~\ocwlowerid{gana}~=~$\ocwkw{fun}~\ocwbc{} gana only used for \ocwstring{"tap"} \ocwstring{"i"} \ocwec{}\ocweol
@@ -24169,9 +24110,9 @@ $[~[~2~::~\ocwlowerid{\_}~]~\rightarrow{}~$\ocwbc{} Ppr of roots in -aa is compl
 \ocwindent{3.00em}
 \ocwkw{match}~$\ocwlowerid{entry}~$\ocwkw{with}~\ocweol
 \ocwindent{3.00em}
-$[~$\ocwstring{"maa\#1"}~$\rightarrow{}~()~$\ocwbc{} no ppra \ocwec{}\ocweol
+$[~$\ocwstring{"bhaa\#1"}~$\mid{}~$\ocwstring{"maa\#1"}~$\mid{}~$\ocwstring{"yaa\#1"}~$\rightarrow{}~()~$\ocwbc{} no known ppra \ocwec{}\ocweol
 \ocwindent{3.00em}
-$\mid{}~\ocwlowerid{\_}~\rightarrow{}~$\ocwkw{let}~$\ocwlowerid{m\_pstem}~=~\ocwlowerid{wstem}~$\ocwkw{and}~$\ocwlowerid{f\_pstem}~=~\ocwlowerid{rev}~(\ocwlowerid{fix2w}~\ocwlowerid{wstem}~$\ocwstring{"at"}~$\ocwlowerid{set})~$\ocwkw{in}\ocweol
+$\mid{}~\ocwlowerid{\_}~\rightarrow{}~$\ocwkw{let}~$\ocwlowerid{m\_pstem}~=~\ocwlowerid{wstem}~$\ocwkw{and}~$\ocwlowerid{f\_pstem}~=~\ocwlowerid{rev}~(\ocwlowerid{fix2w}~\ocwlowerid{wstem}~$\ocwstring{"at"}~$\ocwlowerid{set})~$\ocwkw{in}~\ocweol
 \ocwindent{6.50em}
 $\ocwlowerid{record\_part}~(\ocwupperid{Ppra\_}~2~\ocwupperid{Primary}~\ocwlowerid{m\_pstem}~\ocwlowerid{f\_pstem}~\ocwlowerid{entry})~$\ocweol
 \ocwindent{3.00em}
@@ -24226,7 +24167,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 ** Gana 3  **
 \ocweol
-\label{verbs.ml:47069}%
+\label{verbs.ml:47097}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{strip\_ii}~=~$\ocwkw{fun}~\ocweol
@@ -24798,7 +24739,7 @@ $\ocwlowerid{record\_part\_m\_ath}~(\ocwlowerid{pprm}~3)~\ocwlowerid{short}~\ocw
 \ocwendcode{}\ocwindent{0.00em}
 ** Gana 5  **
 \ocweol
-\label{verbs.ml:56785}%
+\label{verbs.ml:56813}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_athematic\_present5a}~\ocwlowerid{gana}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{vow}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
@@ -25278,7 +25219,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 ** Gana 7  **
 \ocweol
-\label{verbs.ml:65189}%
+\label{verbs.ml:65217}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_athematic\_present7a}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
@@ -25610,7 +25551,7 @@ Conjugation of k.r
 \ocwindent{2.50em}
 "karo" "kuru" "kur" 
 \ocweol
-\label{verbs.ml:70543}%
+\label{verbs.ml:70571}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_athematic\_presentk}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{short}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
@@ -25856,7 +25797,7 @@ $\ocwlowerid{value}~\ocwlowerid{compute\_presentk}~\ocwlowerid{sstem}~\ocwloweri
 \ocwendcode{}\ocwindent{0.00em}
 ** Gana 9  **
 \ocweol
-\label{verbs.ml:74122}%
+\label{verbs.ml:74150}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_athematic\_present9a}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{short}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
@@ -26178,7 +26119,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Benedictive/precative. Formed from \ocwbegindcode{}$\ocwlowerid{conjug\_optativea}$\ocwenddcode{} 
 \ocweol
-\label{verbs.ml:79815}%
+\label{verbs.ml:79843}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{conjug\_benedictivea}~\ocwlowerid{conj}~\ocwlowerid{weak}~\ocwlowerid{entry}~=$\ocweol
@@ -26274,7 +26215,7 @@ $])~$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Similar to \ocwbegindcode{}$\ocwlowerid{compute\_thematic\_paradigm\_act}$\ocwenddcode{} 
 \ocweol
-\label{verbs.ml:81104}%
+\label{verbs.ml:81132}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_futurea}~\ocwlowerid{conj}~\ocwlowerid{stem}~\ocwlowerid{entry}~=~$\ocweol
@@ -26545,7 +26486,7 @@ $\mid{}~$\ocwstring{"s.rj\#1"}~$\rightarrow{}~[~3~]~$\ocwbc{} sra.s.taa \ocwec{}
 \ocwindent{6.00em}
 $\mid{}~$\ocwstring{"k.r.s"}~$\rightarrow{}~[~3~::~\ocwlowerid{vet}~]~$\ocwbc{} ar -> ra optionally \ocwec{}\ocweol
 \ocwindent{6.00em}
-$\mid{}~$\ocwstring{"bh.rjj"}~$\rightarrow{}~[~3~::~\ocwlowerid{anit}~]~$\ocwbc{} idem \ocwec{}\ocweol
+$\mid{}~$\ocwstring{"bh.rjj"}~$\mid{}~$\ocwstring{"sp.rz\#1"}~$\rightarrow{}~[~3~::~\ocwlowerid{anit}~]~$\ocwbc{} idem \ocwec{}\ocweol
 \ocwindent{6.00em}
 $\mid{}~$\ocwstring{"ad\#1"}~$\mid{}~$\ocwstring{"aap"}~$\mid{}~$\ocwstring{"krudh\#1"}~$\mid{}~$\ocwstring{"kruz"}~$\mid{}~$\ocwstring{"k.sip"}~$\mid{}~$\ocwstring{"k.sud"}~\ocweol
 \ocwindent{6.00em}
@@ -26569,7 +26510,7 @@ $\mid{}~$\ocwstring{"vyadh"}~$\mid{}~$\ocwstring{"zak"}~$\mid{}~$\ocwstring{"zad
 \ocwindent{6.00em}
 $\mid{}~$\ocwstring{"zli.s"}~$\mid{}~$\ocwstring{"sa\~{}nj"}~$\mid{}~$\ocwstring{"sic"}~$\mid{}~$\ocwstring{"sidh\#1"}~$\mid{}~$\ocwstring{"s.rp"}~$\mid{}~$\ocwstring{"skand"}~\ocweol
 \ocwindent{6.00em}
-$\mid{}~$\ocwstring{"sp.rz\#1"}~$\mid{}~$\ocwstring{"sva\~{}nj"}~$\mid{}~$\ocwstring{"svid\#2"}~$\mid{}~$\ocwstring{"had"}~\ocweol
+$\mid{}~$\ocwstring{"sva\~{}nj"}~$\mid{}~$\ocwstring{"svid\#2"}~$\mid{}~$\ocwstring{"had"}~\ocweol
 \ocwindent{8.00em}
 $\rightarrow{}~\ocwlowerid{anit}$\ocweol
 \ocwindent{6.00em}
@@ -26611,7 +26552,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Perfect passive participle 
 \ocweol
-\label{verbs.ml:88455}%
+\label{verbs.ml:88483}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{intercalate\_pp}~\ocwlowerid{root}~\ocwlowerid{rstem}~=~$\ocweol
@@ -27156,7 +27097,7 @@ $]~$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Metathesis -arx -> -rax 
 \ocweol
-\label{verbs.ml:101997}%
+\label{verbs.ml:102025}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{ar\_ra}~=~$\ocwkw{fun}~\ocweol
@@ -27193,7 +27134,7 @@ $\mid{}~$\ocwstring{"v.rj"}~$\rightarrow{}~[~1~]$\ocweol
 \ocwindent{6.50em}
 $\mid{}~$\ocwstring{"zuc\#1"}~$\rightarrow{}~[~0;~1~]~$\ocwbc{} zoktum \ocwec{}\ocweol
 \ocwindent{6.50em}
-$\mid{}~$\ocwstring{"d.rz\#1"}~$\rightarrow{}~[~3~]~$\ocwbc{} ar -> ra dra.s.tum \ocwec{}\ocweol
+$\mid{}~$\ocwstring{"d.rz\#1"}~$\mid{}~$\ocwstring{"sp.rz\#1"}~$\rightarrow{}~[~3~]~$\ocwbc{} ar -> ra dra.s.tum \ocwec{}\ocweol
 \ocwindent{6.50em}
 $\mid{}~$\ocwstring{"k.r.s"}~$\mid{}~$\ocwstring{"bh.rjj"}~$\rightarrow{}~[~0;~3~]~$\ocwbc{} berk \ocwec{}\ocweol
 \ocwindent{6.50em}
@@ -27394,7 +27335,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Passive system 
 \ocweol
-\label{verbs.ml:107340}%
+\label{verbs.ml:107380}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{admits\_passive}~=~$\ocwkw{fun}~\ocweol
@@ -27425,7 +27366,7 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Similar to \ocwbegindcode{}$\ocwlowerid{compute\_thematic\_middle}$\ocwenddcode{}  
 \ocweol
-\label{verbs.ml:108019}%
+\label{verbs.ml:108059}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_passive\_present}~\ocwlowerid{verbal}~\ocwlowerid{stem}~\ocwlowerid{entry}~=~$\ocweol
@@ -27673,7 +27614,7 @@ NB b=iopt not sufficient. See Whitney§797
 \ocwindent{0.00em}
 Warning: baroque code ahead 
 \ocweol
-\label{verbs.ml:111748}%
+\label{verbs.ml:111788}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{redup\_perf}~\ocwlowerid{root}~=~$\ocweol
@@ -27762,7 +27703,7 @@ $\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{revw}$\ocweol
 \ocwindent{10.00em}
 $]~$\ocwkw{in}~$(\ocwlowerid{strong}~\ocwlowerid{w},~\ocwlowerid{w})$\medskip
 
-\label{verbs.ml:113997}%
+\label{verbs.ml:114037}%
 \ocwindent{4.50em}
 $\mid{}~\ocwlowerid{\_}~$\ocwbc{} aa ii uu \ocwec{}~$\rightarrow{}~(\ocwlowerid{revs},~\ocwlowerid{revw})$\ocweol
 \ocwindent{4.50em}
@@ -28807,7 +28748,7 @@ Aorist system
 \ocwindent{0.00em}
 augment True for aorist, False for injunctive 
 \ocweol
-\label{verbs.ml:132895}%
+\label{verbs.ml:132935}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{sigma}~\ocwlowerid{augment}~\ocwlowerid{stem}~\ocwlowerid{suff}~=~$\ocweol
@@ -29696,15 +29637,17 @@ $\mid{}~$\ocwstring{"saa\#1"}~$\mid{}~$\ocwstring{"sthaa\#1"}~$\mid{}~$\ocwstrin
 \ocwindent{3.00em}
 \{~$\ocwlowerid{compute\_root\_aorista}~\ocwlowerid{weak}~\ocwlowerid{strong}~\ocwlowerid{entry}~$\ocweol
 \ocwindent{3.00em}
-;~\ocwkw{if}~$\ocwlowerid{entry}~=~$\ocwstring{"k.r\#1"}~$\lor{}~\ocwlowerid{entry}~=~$\ocwstring{"gam"}~$\lor{}~\ocwlowerid{entry}~=~$\ocwstring{"jan"}~\ocweol
-\ocwindent{5.50em}
-\ocwkw{then}~$\ocwlowerid{compute\_root\_aoristm}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwbc{} rare \ocwec{}~\ocweol
+;~\ocwkw{match}~$\ocwlowerid{entry}~$\ocwkw{with}\ocweol
 \ocwindent{4.00em}
-\ocwkw{else}~\ocwkw{if}~$\ocwlowerid{entry}~=~$\ocwstring{"sthaa\#1"}~\ocwbc{} Whitney §834a. \ocwec{}\ocweol
-\ocwindent{8.00em}
-\ocwkw{then}~$\ocwlowerid{compute\_root\_aoristm}~(\ocwlowerid{revstem}~$\ocwstring{"sthi"}$)~\ocwlowerid{entry}~$\ocwbc{} asthita \ocwec{}~\ocweol
+$[~$\ocwstring{"k.r\#1"}~$\mid{}~$\ocwstring{"gam"}~$\mid{}~$\ocwstring{"jan"}~$\rightarrow{}~\ocwlowerid{compute\_root\_aoristm}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwbc{} rare \ocwec{}~\ocweol
+\ocwindent{4.00em}
+$\mid{}~$\ocwstring{"sthaa\#1"}~\ocwbc{} Whitney §834a. \ocwec{}~$\rightarrow{}$\ocweol
+\ocwindent{10.00em}
+$\ocwlowerid{compute\_root\_aoristm}~(\ocwlowerid{revstem}~$\ocwstring{"sthi"}$)~\ocwlowerid{entry}~$\ocwbc{} asthita \ocwec{}~\ocweol
 \ocwindent{5.50em}
-\ocwkw{else}~$()$\ocweol
+$\mid{}~\ocwlowerid{\_}~\rightarrow{}~()$\ocweol
+\ocwindent{4.00em}
+$]$\ocweol
 \ocwindent{3.00em}
 ;~\ocwkw{let}~$\ocwlowerid{stem}~=~$\ocwkw{if}~$\ocwlowerid{entry}~=~$\ocwstring{"muc\#1"}~\ocwkw{then}~$\ocwlowerid{strong}~$\ocwkw{else}~\ocwkw{match}~$\ocwlowerid{long}~$\ocwkw{with}~\ocweol
 \ocwindent{6.00em}
@@ -29716,7 +29659,7 @@ $]~$\ocwkw{in}~\ocweol
 \ocwindent{4.00em}
 $\ocwlowerid{compute\_root\_aoristp}~\ocwlowerid{stem}~\ocwlowerid{entry}~$\ocwbc{} passive \ocwec{}\ocweol
 \ocwindent{3.00em}
-\ocwbc{} for root aorist participles, see Whitney§840 and Burrow p178 \ocwec{}\ocweol
+\ocwbc{} For root aorist participles, see Whitney§840 and Burrow p178 \ocwec{}\ocweol
 \ocwindent{3.00em}
 \}\ocweol
 \ocwindent{2.00em}
@@ -29745,10 +29688,10 @@ $\mid{}~$\ocwstring{"rabh"}~$\rightarrow{}~\ocwlowerid{compute\_root\_aoristp}~(
 $\mid{}~$\ocwstring{"jaag.r"}~$\mid{}~$\ocwstring{"t.rr"}~$\mid{}~$\ocwstring{"pac"}~$\mid{}~$\ocwstring{"zru"}~$\mid{}~$\ocwstring{"stu"}~$\mid{}~$\ocwstring{"hu"}\ocweol
 \ocwindent{4.00em}
 $\rightarrow{}~\ocwlowerid{compute\_root\_aoristp}~\ocwlowerid{long}~\ocwlowerid{entry}~$\ocweol
+\ocwindent{5.50em}
+\ocwbc{} NB \ocwstring{"zru"} -> azraavi WR while Whitney§844a azraayi typo \ocwec{}~\ocweol
 \ocwindent{2.00em}
-\ocwbc{} \ocwstring{"zru"} -> azraayi Whitney§844a typo ? (azraayi WR) \ocwec{}~\ocweol
-\ocwindent{2.00em}
-$\mid{}~\ocwlowerid{\_}~\rightarrow{}~()~$\ocwbc{} \ocwstring{"i"} -> iiyaat difficile \ocwec{}\ocweol
+$\mid{}~\ocwlowerid{\_}~\rightarrow{}~()~$\ocwbc{} \ocwstring{"i"} -> iiyaat hard \ocwec{}\ocweol
 \ocwindent{2.00em}
 $]$\ocweol
 \ocwindent{1.00em}
@@ -29764,7 +29707,7 @@ $\rightarrow{}~$\ocwkw{do}\ocweol
 \ocwindent{3.00em}
 \{~$\ocwlowerid{compute\_thematic\_aorista}~\ocwlowerid{weak}~\ocwlowerid{entry}$\ocweol
 \ocwindent{3.00em}
-;~$\ocwlowerid{compute\_thematic\_aoristm}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwbc{} middle is very rare \ocwec{}\ocweol
+;~$\ocwlowerid{compute\_thematic\_aoristm}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwbc{} middle very rare \ocwec{}\ocweol
 \ocwindent{3.00em}
 \}\ocweol
 \ocwindent{2.00em}
@@ -29820,9 +29763,7 @@ $\mid{}~$\ocwstring{"iik.s"}~$\mid{}~$\ocwstring{"klid"}~$\mid{}~$\ocwstring{"gu
 \ocwindent{3.00em}
 $\rightarrow{}~$\ocwbc{} active only \ocwec{}\ocweol
 \ocwindent{3.00em}
-\ocwkw{let}~$\ocwlowerid{stem}~=~\ocwlowerid{redup\_aor}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwkw{in}~\ocweol
-\ocwindent{3.00em}
-$\ocwlowerid{compute\_redup\_aorista}~\ocwlowerid{stem}~\ocwlowerid{entry}$\ocweol
+\ocwkw{let}~$\ocwlowerid{stem}~=~\ocwlowerid{redup\_aor}~\ocwlowerid{weak}~\ocwlowerid{entry}~$\ocwkw{in}~$\ocwlowerid{compute\_redup\_aorista}~\ocwlowerid{stem}~\ocwlowerid{entry}$\ocweol
 \ocwindent{2.00em}
 $\mid{}~$\ocwstring{"grah"}~$\rightarrow{}~$\ocwkw{do}~\ocweol
 \ocwindent{3.00em}
@@ -29834,9 +29775,7 @@ $\mid{}~$\ocwstring{"grah"}~$\rightarrow{}~$\ocwkw{do}~\ocweol
 \ocwindent{4.00em}
 \}\ocweol
 \ocwindent{3.00em}
-;~\ocwkw{let}~$\ocwlowerid{stem}~=~\ocwlowerid{redup\_aor}~(\ocwlowerid{revcode}~$\ocwstring{"grabh"}$)~\ocwlowerid{entry}~$\ocwkw{in}~\ocwkw{do}\ocweol
-\ocwindent{4.00em}
-\ocwbc{} ved -- Whitney§223g \ocwec{}\ocweol
+;~\ocwkw{let}~$\ocwlowerid{stem}~=~\ocwlowerid{redup\_aor}~(\ocwlowerid{revcode}~$\ocwstring{"grabh"}$)~\ocwlowerid{entry}~$\ocwkw{in}~\ocwkw{do}~\ocwbc{} ved Whitney§223g \ocwec{}\ocweol
 \ocwindent{4.00em}
 \{~$\ocwlowerid{compute\_redup\_aorista}~\ocwlowerid{stem}~\ocwlowerid{entry}$\ocweol
 \ocwindent{4.00em}
@@ -29856,7 +29795,7 @@ $\mid{}~$\ocwstring{"daa\#1"}~$\rightarrow{}~$\ocwkw{let}~$\ocwlowerid{stem}~=~(
 \ocwindent{3.00em}
 \ocwbc{} then exceptions to treatment of aa with intercalaring ii \ocwec{}\ocweol
 \ocwindent{2.00em}
-$\mid{}~$\ocwstring{"raadh"}~$\rightarrow{}~$\ocwkw{let}~$\ocwlowerid{stem}~=~\ocwlowerid{redup\_aor}~(\ocwlowerid{revcode}~$\ocwstring{"radh"}$)~\ocwlowerid{entry}~$\ocwkw{in}~\ocwbc{} riiradh \ocwec{}~\ocweol
+$\mid{}~$\ocwstring{"raadh"}~$\rightarrow{}~$\ocwkw{let}~$\ocwlowerid{stem}~=~\ocwlowerid{redup\_aor}~(\ocwlowerid{revcode}~$\ocwstring{"radh"}$)~$\ocwbc{} riiradh \ocwec{}~$\ocwlowerid{entry}~$\ocwkw{in}~\ocweol
 \ocwindent{8.50em}
 $\ocwlowerid{compute\_redup\_aorista}~\ocwlowerid{stem}~\ocwlowerid{entry}~$\ocwbc{} Macdonnel p 126 \ocwec{}\ocweol
 \ocwindent{2.00em}
@@ -29888,7 +29827,7 @@ $\mid{}~$\ocwstring{"muc\#1"}~$\mid{}~$\ocwstring{"yaj\#1"}~$\mid{}~$\ocwstring{
 \ocwindent{2.00em}
 $\mid{}~$\ocwstring{"s.rj\#1"}~$\mid{}~$\ocwstring{"stu"}~$\mid{}~$\ocwstring{"sp.rz\#1"}~$\mid{}~$\ocwstring{"hu"}~$\rightarrow{}~$\ocwkw{do}\ocweol
 \ocwindent{3.00em}
-\{~\ocwkw{let}~$\ocwlowerid{stema}~=~$\ocwkw{match}~$\ocwlowerid{entry}~$\ocwkw{with}\ocweol
+\{~\ocwkw{let}~$\ocwlowerid{stem}~=~$\ocwkw{match}~$\ocwlowerid{entry}~$\ocwkw{with}\ocweol
 \ocwindent{6.00em}
 $[~$\ocwstring{"d.rz\#1"}~$\mid{}~$\ocwstring{"s.rj\#1"}~$\mid{}~$\ocwstring{"sp.rz\#1"}~$\rightarrow{}~\ocwlowerid{long\_metathesis}~\ocwlowerid{weak}$\ocweol
 \ocwindent{6.00em}
@@ -29898,7 +29837,7 @@ $\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{long}$\ocweol
 \ocwindent{6.00em}
 $]~$\ocwkw{in}\ocweol
 \ocwindent{4.00em}
-$\ocwlowerid{compute\_ath\_s\_aorista}~\ocwlowerid{stema}~\ocwlowerid{entry}~$\ocweol
+$\ocwlowerid{compute\_ath\_s\_aorista}~\ocwlowerid{stem}~\ocwlowerid{entry}~$\ocweol
 \ocwindent{3.00em}
 ;~\ocwkw{if}~$\ocwlowerid{entry}~=~$\ocwstring{"yuj\#1"}~$\lor{}~\ocwlowerid{entry}~=~$\ocwstring{"chid\#1"}~\ocweol
 \ocwindent{5.50em}
@@ -30122,7 +30061,7 @@ $[~$\ocwstring{"gam"}~$\mid{}~$\ocwstring{"g.rdh"}~$\mid{}~$\ocwstring{"zuc\#1"}
 \ocwindent{2.00em}
 $\mid{}~$\ocwstring{"vac"}~$\rightarrow{}~\ocwlowerid{compute\_thematic\_injuncta}~(\ocwlowerid{revcode}~$\ocwstring{"voc"}$)~\ocwlowerid{entry}~$\ocwbc{} vocat \ocwec{}\medskip
 
-\label{verbs.ml:157928}%
+\label{verbs.ml:157921}%
 \ocwindent{2.00em}
 $\mid{}~\ocwlowerid{\_}~\rightarrow{}~()~$\ocweol
 \ocwindent{2.00em}
@@ -30308,7 +30247,7 @@ $]~$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Periphrastic future, Infinitive, Passive future participle in -tavya 
 \ocweol
-\label{verbs.ml:161448}%
+\label{verbs.ml:161441}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_peri\_fut}~\ocwlowerid{conj}~\ocwlowerid{perstem}~\ocwlowerid{entry}~=~$\ocweol
@@ -30434,7 +30373,7 @@ $\ocwlowerid{iter}~($\ocwkw{fun}~$\ocwlowerid{st}~\rightarrow{}~\ocwlowerid{peri
 \ocwendcode{}\ocwindent{0.00em}
 Passive future participle in -ya and -aniiya in all conjugations 
 \ocweol
-\label{verbs.ml:164086}%
+\label{verbs.ml:164079}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{palatal\_exception}~\ocwlowerid{root}~=~\ocwupperid{List.}\ocwlowerid{mem}~\ocwlowerid{root}$\ocweol
@@ -30697,7 +30636,7 @@ $\ocwlowerid{value}~\ocwlowerid{record\_pfp\_10}~\ocwlowerid{entry}~\ocwlowerid{
 \ocwendcode{}\ocwindent{0.00em}
 Absolutive and Past Participle 
 \ocweol
-\label{verbs.ml:169817}%
+\label{verbs.ml:169810}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{record\_part\_ppp}~\ocwlowerid{ppstem}~\ocwlowerid{entry}~=~$\ocwkw{do}~\ocweol
@@ -31011,9 +30950,15 @@ $\ocwlowerid{value}~\ocwlowerid{record\_ppp\_abs\_den}~\ocwlowerid{ystem}~\ocwlo
 \ocwindent{1.00em}
 \{~$\ocwlowerid{record\_part\_ppp}~(\ocwlowerid{rfix}~\ocwlowerid{ppstem}~$\ocwstring{"ita"}$)~\ocwlowerid{entry}~$\ocweol
 \ocwindent{1.00em}
-;~$\ocwlowerid{record\_abso\_tvaa}~(\ocwlowerid{fix}~\ocwlowerid{ystem}~$\ocwstring{"itvaa"}$)~\ocwlowerid{entry}~$\ocweol
+;~\ocwkw{match}~$\ocwlowerid{entry}~$\ocwkw{with}\ocweol
+\ocwindent{2.00em}
+$[~$\ocwstring{"aakar.na"}~$\rightarrow{}~\ocwlowerid{record\_abso\_tvaa}~(\ocwlowerid{fix}~\ocwlowerid{ppstem}~$\ocwstring{"ya"}$)~\ocwlowerid{entry}~$\ocwbc{} fake abso-ya! \ocwec{}\ocweol
+\ocwindent{2.00em}
+$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{record\_abso\_tvaa}~(\ocwlowerid{fix}~\ocwlowerid{ystem}~$\ocwstring{"itvaa"}$)~\ocwlowerid{entry}~$\ocweol
+\ocwindent{2.00em}
+$]$\ocweol
 \ocwindent{1.00em}
-\ocwbc{} no \ocwbegindcode{}$\ocwlowerid{record\_abso\_ya}$\ocwenddcode{} since usually no preverb to denominatives \ocwec{}\ocweol
+\ocwbc{} no general \ocwbegindcode{}$\ocwlowerid{record\_abso\_ya}$\ocwenddcode{} since usually no preverb to denominatives \ocwec{}\ocweol
 \ocwindent{1.00em}
 \}\ocweol
 \ocwindent{0.00em}
@@ -31156,7 +31101,7 @@ $\ocwlowerid{record\_absolutive}~\ocwupperid{Desiderative}~\ocwlowerid{abs\_stem
 \ocwendcode{}\ocwindent{0.00em}
 Intensive or frequentative 
 \ocweol
-\label{verbs.ml:179792}%
+\label{verbs.ml:179910}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_intensive\_presenta}~\ocwlowerid{strong}~\ocwlowerid{weak}~\ocwlowerid{iiflag}~\ocwlowerid{entry}~=$\ocweol
@@ -31339,7 +31284,7 @@ rather than a table. \ocwec{}\medskip
 \ocwendcode{}\ocwindent{0.00em}
 Similar to \ocwbegindcode{}$\ocwlowerid{compute\_active\_present3}$\ocwenddcode{} with Intensive, plus optional ii forms 
 \ocweol
-\label{verbs.ml:182992}%
+\label{verbs.ml:183110}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_intensivea}~\ocwlowerid{wstem}~\ocwlowerid{sstem}~\ocwlowerid{entry}~\ocwlowerid{third}~=~$\ocweol
@@ -31378,7 +31323,7 @@ $\ocwlowerid{compute\_athematic\_present3m}~\ocwupperid{Intensive}~\ocwlowerid{i
 \ocwendcode{}\ocwindent{0.00em}
 Present system 
 \ocweol
-\label{verbs.ml:183869}%
+\label{verbs.ml:183987}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_present\_system}~\ocwlowerid{entry}~\ocwlowerid{rstem}~\ocwlowerid{gana}~\ocwlowerid{pada}~\ocwlowerid{third}~=~$\ocweol
@@ -31975,7 +31920,7 @@ Passive system
 NB. For gana 4 verbs passive differs from middle mostly by accent
    but distinction necessary since different regime 
 \ocweol
-\label{verbs.ml:198823}%
+\label{verbs.ml:198941}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{compute\_passive\_primary}~\ocwlowerid{entry}~\ocwlowerid{ps\_stem}~=~$\ocweol
@@ -32151,7 +32096,7 @@ BEWARE. the entry forms given in the next two functions must be in normalized
    form - no non-genuine anusvaara 
    This should be replaced by the recording of the 3rd sg form, like others. 
 \ocweol
-\label{verbs.ml:203674}%
+\label{verbs.ml:203792}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{den\_stem\_a}~\ocwlowerid{entry}~=~$\ocwbc{} in general transitive Whitney§1059c \ocwec{}\ocweol
@@ -32170,7 +32115,8 @@ $\mid{}~$\ocwstring{"agada"}~\ocwbc{} Kale§660 \ocwec{}~$\mid{}~$\ocwstring{"ir
 \ocwindent{3.50em}
 $\rightarrow{}~\ocwlowerid{trunc}~\ocwlowerid{rstem}~$\ocwbc{} -()yati \ocwec{}~\ocwbc{} lopa \ocwec{}~\ocweol
 \ocwindent{1.50em}
-\ocwbc{} \ocwstring{"maarg"} \ocwstring{"mok.s"} \ocwstring{"lak.s"} \ocwstring{"suuc"} presently roots class 10 \ocwec{}\ocweol
+\ocwbc{} | \ocwstring{"maarg"} | \ocwstring{"mok.s"} | \ocwstring{"lak.s"} | \ocwstring{"suuc"} 
+    -> \ocwbegindcode{}~1::~$\ocwlowerid{rstem}~$\ocwenddcode{} \ocwbc{} -ayati \ocwec{} presently roots class 10 \ocwec{}\ocweol
 \ocwindent{1.50em}
 $\mid{}~$\ocwstring{"kutsaa"}~$\mid{}~$\ocwstring{"maalaa"}~$\mid{}~$\ocwstring{"mudraa"}~$\mid{}~$\ocwstring{"medhaa"}~\ocweol
 \ocwindent{3.50em}
@@ -32227,19 +32173,21 @@ $\mid{}~$\ocwstring{"kha.da"}~$\mid{}~$\ocwstring{"garva"}~$\mid{}~$\ocwstring{"
 \ocwindent{1.50em}
 $\mid{}~$\ocwstring{"tantra"}~$\mid{}~$\ocwstring{"tarafga"}~$\mid{}~$\ocwstring{"taru.na"}~$\mid{}~$\ocwstring{"tuhina"}~$\mid{}~$\ocwstring{"da.n.da"}~$\mid{}~$\ocwstring{"deva"}~$\mid{}~$\ocwstring{"dola"}\ocweol
 \ocwindent{1.50em}
-$\mid{}~$\ocwstring{"dhiira\#1"}~$\mid{}~$\ocwstring{"nuutana"}~$\mid{}~$\ocwstring{"pa.tapa.taa"}~$\mid{}~$\ocwstring{"pallava"}~$\mid{}~$\ocwstring{"pavitra"}~$\mid{}~$\ocwstring{"paaza"}~\ocweol
+$\mid{}~$\ocwstring{"dravat"}~$\mid{}~$\ocwstring{"dhiira\#1"}~$\mid{}~$\ocwstring{"nuutana"}~$\mid{}~$\ocwstring{"pa.tapa.taa"}~$\mid{}~$\ocwstring{"pallava"}\ocweol
+\ocwindent{1.50em}
+$\mid{}~$\ocwstring{"pavitra"}~$\mid{}~$\ocwstring{"paaza"}~$\mid{}~$\ocwstring{"pi.n.da"}~$\mid{}~$\ocwstring{"pulaka"}~$\mid{}~$\ocwstring{"puula"}~$\mid{}~$\ocwstring{"pratikuula"}~\ocweol
 \ocwindent{1.50em}
-$\mid{}~$\ocwstring{"pi.n.da"}~$\mid{}~$\ocwstring{"pulaka"}~$\mid{}~$\ocwstring{"puula"}~$\mid{}~$\ocwstring{"pratikuula"}~$\mid{}~$\ocwstring{"prati.sedha"}~\ocweol
+$\mid{}~$\ocwstring{"prati.sedha"}~$\mid{}~$\ocwstring{"pradak.si.na"}~$\mid{}~$\ocwstring{"prasaada"}~$\mid{}~$\ocwstring{"bhi.saj"}~$\mid{}~$\ocwstring{"mantra"}~\ocweol
 \ocwindent{1.50em}
-$\mid{}~$\ocwstring{"pradak.si.na"}~$\mid{}~$\ocwstring{"prasaada"}~$\mid{}~$\ocwstring{"bhi.saj"}~$\mid{}~$\ocwstring{"mantra"}~$\mid{}~$\ocwstring{"malina"}~$\mid{}~$\ocwstring{"mizra"}\ocweol
+$\mid{}~$\ocwstring{"malina"}~$\mid{}~$\ocwstring{"mizra"}~$\mid{}~$\ocwstring{"mukula"}~$\mid{}~$\ocwstring{"mukhara"}~$\mid{}~$\ocwstring{"mu.n.da"}~$\mid{}~$\ocwstring{"muutra"}~\ocweol
 \ocwindent{1.50em}
-$\mid{}~$\ocwstring{"mukula"}~$\mid{}~$\ocwstring{"mukhara"}~$\mid{}~$\ocwstring{"mu.n.da"}~$\mid{}~$\ocwstring{"muutra"}~$\mid{}~$\ocwstring{"m.rga"}~$\mid{}~$\ocwstring{"yantra"}~$\mid{}~$\ocwstring{"rasa"}~\ocweol
+$\mid{}~$\ocwstring{"m.rga"}~$\mid{}~$\ocwstring{"yantra"}~$\mid{}~$\ocwstring{"rasa"}~$\mid{}~$\ocwstring{"ruuk.sa"}~$\mid{}~$\ocwstring{"lagha"}~\ocwbc{} u -> a \ocwec{}~\ocweol
 \ocwindent{1.50em}
-$\mid{}~$\ocwstring{"ruuk.sa"}~$\mid{}~$\ocwstring{"lagha"}~\ocwbc{} u -> a \ocwec{}~$\mid{}~$\ocwstring{"var.na"}~$\mid{}~$\ocwstring{"vaasa\#3"}~$\mid{}~$\ocwstring{"vizada"}\ocweol
+$\mid{}~$\ocwstring{"var.na"}~$\mid{}~$\ocwstring{"vaasa\#3"}~$\mid{}~$\ocwstring{"vizada"}~$\mid{}~$\ocwstring{"vra.na"}~$\mid{}~$\ocwstring{"zaanta"}~$\mid{}~$\ocwstring{"zithila"}\ocweol
 \ocwindent{1.50em}
-$\mid{}~$\ocwstring{"vra.na"}~$\mid{}~$\ocwstring{"zaanta"}~$\mid{}~$\ocwstring{"zithila"}~$\mid{}~$\ocwstring{"zyena"}~$\mid{}~$\ocwstring{".sa.n.dha"}~$\mid{}~$\ocwstring{"sapi.n.da"}~\ocweol
+$\mid{}~$\ocwstring{"zyena"}~$\mid{}~$\ocwstring{".sa.n.dha"}~$\mid{}~$\ocwstring{"sapi.n.da"}~$\mid{}~$\ocwstring{"saphala"}~$\mid{}~$\ocwstring{"sabhaaja"}~$\mid{}~$\ocwstring{"saantva"}~\ocweol
 \ocwindent{1.50em}
-$\mid{}~$\ocwstring{"saphala"}~$\mid{}~$\ocwstring{"sabhaaja"}~$\mid{}~$\ocwstring{"saantva"}~$\mid{}~$\ocwstring{"saavadhaana"}~$\mid{}~$\ocwstring{"suutra"}~$\mid{}~$\ocwstring{"stena"}~\ocweol
+$\mid{}~$\ocwstring{"saavadhaana"}~$\mid{}~$\ocwstring{"suutra"}~$\mid{}~$\ocwstring{"stena"}~\ocweol
 \ocwindent{1.50em}
 $\mid{}~$\ocwstring{"sthaga"}~$\mid{}~$\ocwstring{"tapas"}~\ocwbc{} practice \Pan{3,1,15} \ocwec{}\ocweol
 \ocwindent{1.50em}
@@ -32279,7 +32227,7 @@ $[~$\ocwstring{"artha"}~$\mid{}~$\ocwstring{"i.sa"}~$\mid{}~$\ocwstring{"kuha"}~
 \ocwindent{1.50em}
 $\mid{}~$\ocwstring{"viira"}~$\mid{}~$\ocwstring{"safgraama"}~$\mid{}~$\ocwstring{"suutra"}~\ocwbc{} also zithila below \ocwec{}\ocweol
 \ocwindent{3.50em}
-$\rightarrow{}~\ocwlowerid{rstem}~$\ocwbc{} -ayate \ocwec{}~\ocweol
+$\rightarrow{}~\ocwlowerid{rstem}~$\ocwbc{} (a)-yate \ocwec{}~\ocweol
 \ocwindent{1.50em}
 $\mid{}~$\ocwstring{"asuuya"}~\ocwbc{} \ocwstring{"asu"} lengthened \ocwec{}\ocweol
 \ocwindent{3.50em}
@@ -32289,7 +32237,7 @@ $\mid{}~$\ocwstring{"tavi.sa"}~$\mid{}~$\ocwstring{"citra"}~\ocwbc{} do \Pan{3,1
 \ocwindent{3.50em}
 $\rightarrow{}~[~4~::~\ocwlowerid{trunc\_a}~\ocwlowerid{rstem}~]~$\ocwbc{} -()iiyate \ocwec{}\ocweol
 \ocwindent{1.50em}
-$\mid{}~$\ocwstring{"apsaras"}~$\mid{}~$\ocwstring{"sumanas"}~\ocwbc{} act as , become \Pan{3,1,11-12} \ocwec{}~\ocweol
+$\mid{}~$\ocwstring{"apsaras"}~$\mid{}~$\ocwstring{"sumanas"}~\ocwbc{} act as, become \Pan{3,1,11-12} \ocwec{}~\ocweol
 \ocwindent{1.50em}
 $\mid{}~$\ocwstring{"unmanas"}~\ocweol
 \ocwindent{1.50em}
@@ -37645,13 +37593,13 @@ Reads its input in shell variable \ocwbegindcode{}$\ocwupperid{QUERY\_STRING}$\o
 \label{indexer.ml:1038}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
-\ocwkw{open}~$\ocwupperid{Html};~$\ocwbc{} abort \ocwec{}\ocweol
+\ocwkw{open}~$\ocwupperid{Html};~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{table\_begin}$\ocwenddcode{} etc. \ocwec{}~\ocweol
 \ocwindent{0.00em}
-\ocwkw{open}~$\ocwupperid{Web};~$\ocwbc{} ps pl etc. \ocwec{}\ocweol
+\ocwkw{open}~$\ocwupperid{Web};~$\ocwbc{} ps pl abort etc. \ocwec{}~\ocweol
 \ocwindent{0.00em}
 \ocwkw{open}~$\ocwupperid{Cgi};$\medskip
 
-\label{indexer.ml:1099}%
+\label{indexer.ml:1120}%
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{answer\_begin}~()~=~$\ocwkw{do}\ocweol
 \ocwindent{1.00em}
@@ -37662,7 +37610,7 @@ $\ocwlowerid{value}~\ocwlowerid{answer\_begin}~()~=~$\ocwkw{do}\ocweol
 ;~$\ocwlowerid{ps}~\ocwlowerid{th\_begin}$\ocweol
 \ocwindent{1.00em}
 \}\ocweol
-\ocwindent{1.00em}
+\ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{answer\_end}~()~=~$\ocwkw{do}\ocweol
@@ -37676,7 +37624,7 @@ $\ocwlowerid{value}~\ocwlowerid{answer\_end}~()~=~$\ocwkw{do}\ocweol
 ;~$\ocwlowerid{pl}~\ocwlowerid{html\_paragraph}$\ocweol
 \ocwindent{1.00em}
 \}\ocweol
-\ocwindent{1.00em}
+\ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{ok}~(\ocwlowerid{mess},\ocwlowerid{s})~=~$\ocwkw{do}~\{~$\ocwlowerid{ps}~\ocwlowerid{mess};~\ocwlowerid{pl}~(\ocwupperid{Morpho\_html.}\ocwlowerid{skt\_anchor\_R}~\ocwupperid{False}~\ocwlowerid{s})~\}$\ocweol
@@ -37686,9 +37634,9 @@ $\ocwlowerid{value}~\ocwlowerid{ok}~(\ocwlowerid{mess},\ocwlowerid{s})~=~$\ocwkw
 \ocwbc{} ok2 prints the entry under the spelling given by the user, i.e. without 
         normalisation, thus e.g. sandhi is not written sa.mdhi, and possibly 
         suffixed by homonymy index 1, e.g. b.rh. \ocwec{}\ocweol
-\ocwindent{1.50em}
+\ocwindent{0.00em}
 ;\ocweol
-\ocwindent{1.50em}
+\ocwindent{0.00em}
 \ocwbc{} Should share \ocwbegindcode{}$\ocwupperid{Lemmatizer}.\ocwlowerid{load\_inflected}$\ocwenddcode{} \ocwec{}\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{load\_inflected}~\ocwlowerid{file}~=~(\ocwupperid{Gen.}\ocwlowerid{gobble}~\ocwlowerid{file}~:~\ocwupperid{Morphology.}\ocwlowerid{inflected\_map})$\ocweol
@@ -37704,7 +37652,7 @@ $\ocwlowerid{value}~\ocwlowerid{load\_nouns}~()~=~\ocwlowerid{load\_inflected}~\
 \ocwkw{and}~$\ocwlowerid{load\_indecls}~()~=~\ocwlowerid{load\_inflected}~\ocwlowerid{public\_inde\_file}$\ocweol
 \ocwindent{0.00em}
 \ocwkw{and}~$\ocwlowerid{load\_parts}~()~=~\ocwlowerid{load\_inflected}~\ocwlowerid{public\_parts\_file}$\ocweol
-\ocwindent{1.00em}
+\ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{back\_ground}~=~\ocwlowerid{background}~\ocwupperid{Chamois}$\ocweol
@@ -37736,7 +37684,7 @@ $\ocwupperid{List.}\ocwlowerid{iter}~\ocwlowerid{pi}~\ocwlowerid{l}$\ocweol
 ;~$\ocwlowerid{pl}~\ocwlowerid{html\_break}$\ocweol
 \ocwindent{1.00em}
 \}\ocweol
-\ocwindent{1.50em}
+\ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{try\_declensions}~\ocwlowerid{word}~\ocwlowerid{before}~=~$\ocweol
@@ -37837,21 +37785,21 @@ $\ocwlowerid{value}~\ocwlowerid{index\_engine}~()~=~$\ocwkw{do}\ocweol
 \ocwindent{1.00em}
 \{~$\ocwlowerid{print\_title\_solid}~\ocwupperid{Mauve}~(\ocwupperid{Some}~\ocwlowerid{lang})~(\ocwlowerid{dico\_title}~\ocwlowerid{lang})$\ocweol
 \ocwindent{1.00em}
-;~$\ocwlowerid{answer\_begin}~()$\ocweol
-\ocwindent{1.00em}
-;~$\ocwlowerid{ps}~(\ocwlowerid{div\_begin}~\ocwupperid{Latin12})$\ocweol
-\ocwindent{1.00em}
-;~\ocwkw{let}~$\ocwlowerid{str}~=~\ocwlowerid{decode\_url}~\ocwlowerid{url\_encoded\_entry}~$\ocwbc{} in translit \ocwec{}\ocweol
+;~\ocwkw{let}~$\ocwlowerid{str}~=~\ocwlowerid{decode\_url}~\ocwlowerid{url\_encoded\_entry}~$\ocwbc{} in translit \ocwec{}~\ocweol
 \ocwindent{2.00em}
 \ocwkw{and}~$\ocwlowerid{encode}~=~\ocwupperid{Encode.}\ocwlowerid{switch\_code}~\ocwlowerid{translit}~$\ocweol
 \ocwindent{2.00em}
 \ocwkw{and}~$()~=~\ocwlowerid{toggle\_lexicon}~\ocwlowerid{lex}~$\ocwkw{in}\ocweol
 \ocwindent{2.00em}
-\ocwkw{try}~\ocwkw{let}~$\ocwlowerid{word}~=~\ocwlowerid{encode}~\ocwlowerid{str}~$\ocwbc{} normalization \ocwec{}~\ocwkw{in}\ocweol
+\ocwkw{try}~\ocwkw{let}~$\ocwlowerid{word}~=~\ocwlowerid{encode}~\ocwlowerid{str}~$\ocwbc{} normalization \ocwec{}~\ocwkw{in}~\ocweol
+\ocwindent{4.00em}
+\ocwkw{let}~$\ocwlowerid{str\_VH}~=~\ocwupperid{Canon.}\ocwlowerid{decode}~\ocwlowerid{word}~$\ocwkw{in}~\ocwkw{do}~\ocweol
+\ocwindent{4.00em}
+\{~$\ocwlowerid{answer\_begin}~()$\ocweol
 \ocwindent{4.00em}
-\ocwkw{let}~$\ocwlowerid{str\_VH}~=~\ocwupperid{Canon.}\ocwlowerid{decode}~\ocwlowerid{word}~$\ocwkw{in}~\ocwkw{do}\ocweol
+;~$\ocwlowerid{ps}~(\ocwlowerid{div\_begin}~\ocwupperid{Latin12})$\ocweol
 \ocwindent{4.00em}
-\{~\ocwkw{match}~$\ocwlowerid{lex}~$\ocwkw{with}~\ocweol
+;~\ocwkw{match}~$\ocwlowerid{lex}~$\ocwkw{with}~\ocweol
 \ocwindent{5.00em}
 $[~$\ocwstring{"MW"}~$\rightarrow{}~$\ocweol
 \ocwindent{6.00em}
@@ -37917,18 +37865,16 @@ $]$\ocweol
 \ocwindent{4.00em}
 ;~$\ocwlowerid{answer\_end}~()$\ocweol
 \ocwindent{4.00em}
-;~$()~$\ocweol
-\ocwindent{4.00em}
 ;~$\ocwlowerid{page\_end}~\ocwlowerid{lang}~\ocwupperid{True}$\ocweol
 \ocwindent{4.00em}
-\}~\ocweol
+\}~\ocwbc{} do \ocwec{}\ocweol
 \ocwindent{2.00em}
 \ocwkw{with}~$[~\ocwupperid{Stream.Error}~\ocwlowerid{\_}~\rightarrow{}~\ocwlowerid{abort}~\ocwlowerid{lang}~$\ocwstring{"Illegal\ocwvspace{}transliteration\ocwvspace{}"}~$\ocwlowerid{str}~]$\ocweol
 \ocwindent{1.00em}
 \}~\ocwbc{} do \ocwec{}\ocweol
 \ocwindent{1.00em}
 \}~\ocwbc{} do \ocwec{}\ocweol
-\ocwindent{1.00em}
+\ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{safe\_index\_engine}~()~=~$\ocweol
@@ -38052,7 +37998,7 @@ $\ocwlowerid{value}~\ocwlowerid{print\_word}~\ocwlowerid{c}~=~\ocwlowerid{pl}~(\
    give back the dummy by normalisation such as removing diacritics \ocwec{}\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{read\_dummies}~()~=$\ocweol
-\ocwindent{0.50em}
+\ocwindent{1.00em}
 $(\ocwupperid{Gen.}\ocwlowerid{gobble}~\ocwlowerid{public\_dummies\_file}~:~\ocwupperid{Deco.}\ocwlowerid{deco}~\ocwupperid{Word.}\ocwlowerid{word})$\ocweol
 \ocwindent{0.00em}
 ;\ocweol
@@ -38065,10 +38011,6 @@ $\ocwlowerid{value}~\ocwlowerid{index\_engine}~()~=~$\ocweol
 \ocwindent{2.50em}
 \{~$\ocwlowerid{prelude}~()~$\ocweol
 \ocwindent{2.50em}
-;~$\ocwlowerid{answer\_begin}~()$\ocweol
-\ocwindent{2.50em}
-;~$\ocwlowerid{ps}~(\ocwlowerid{div\_begin}~\ocwupperid{Latin12})$\ocweol
-\ocwindent{2.50em}
 ;~\ocwkw{let}~$\ocwlowerid{query}~=~\ocwupperid{Sys.}\ocwlowerid{getenv}~$\ocwstring{"QUERY\_STRING"}~\ocwkw{in}\ocweol
 \ocwindent{3.50em}
 \ocwkw{let}~$\ocwlowerid{alist}~=~\ocwlowerid{create\_env}~\ocwlowerid{query}~$\ocwkw{in}\ocweol
@@ -38083,7 +38025,11 @@ $\ocwlowerid{value}~\ocwlowerid{index\_engine}~()~=~$\ocweol
 \ocwindent{3.50em}
 \ocwkw{try}~\ocwkw{let}~$\ocwlowerid{word}~=~\ocwupperid{Encode.}\ocwlowerid{code\_skt\_ref\_d}~\ocwlowerid{str}~$\ocwbc{} normalization \ocwec{}~\ocwkw{in}~\ocwkw{do}\ocweol
 \ocwindent{5.50em}
-\{~\ocwkw{let}~$\ocwlowerid{words}~=~\ocwupperid{Deco.}\ocwlowerid{assoc}~\ocwlowerid{word}~\ocwlowerid{dummies\_deco}~$\ocwkw{in}\ocweol
+\{~$\ocwlowerid{answer\_begin}~()$\ocweol
+\ocwindent{5.50em}
+;~$\ocwlowerid{ps}~(\ocwlowerid{div\_begin}~\ocwupperid{Latin12})$\ocweol
+\ocwindent{5.50em}
+;~\ocwkw{let}~$\ocwlowerid{words}~=~\ocwupperid{Deco.}\ocwlowerid{assoc}~\ocwlowerid{word}~\ocwlowerid{dummies\_deco}~$\ocwkw{in}\ocweol
 \ocwindent{6.50em}
 \ocwkw{match}~$\ocwlowerid{words}~$\ocwkw{with}\ocweol
 \ocwindent{7.50em}
@@ -49818,7 +49764,7 @@ $\ocwlowerid{value}~\ocwlowerid{safe\_engine}~:~$\ocwbt{unit}~$\rightarrow{}~$\o
 \ocwendcode{}\typeout{OcamlWeb file Interface.ml}
 \ocwmodule{Interface}
 \label{interface.ml:0}%
-Sanskrit Reader Summarizing interface. 
+Sanskrit Reader Summarizing interface. Yields sktgraph.cgi 
 \ocweol
 \ocwindent{0.00em}
 We construct a CGI Interface displaying the segmentation graph in which the 
@@ -49826,12 +49772,12 @@ We construct a CGI Interface displaying the segmentation graph in which the
    call the standard displaying of all, or of preferred solutions consistent 
    with the current checkpoints. An undo button allows backtracking. 
 \ocweol
-\label{interface.ml:972}%
+\label{interface.ml:992}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 \ocwkw{module}~$\ocwupperid{Interface}~=~$\ocwkw{struct}\medskip
 
-\label{interface.ml:999}%
+\label{interface.ml:1019}%
 \ocwindent{0.00em}
 \ocwkw{open}~$\ocwupperid{Graph\_segmenter};~$\ocwbc{} \ocwbegindcode{}$\ocwupperid{Segment}~\ocwlowerid{cur\_chunk}~\ocwlowerid{set\_cur\_offset}~\ocwlowerid{graph}~\ocwlowerid{visual}$\ocwenddcode{} \ocwec{}\ocweol
 \ocwindent{0.00em}
@@ -49841,17 +49787,17 @@ We construct a CGI Interface displaying the segmentation graph in which the
 \ocwindent{0.00em}
 \ocwkw{open}~$\ocwupperid{Dispatcher};~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{transducer\_vect}~\ocwlowerid{phase}~\ocwupperid{Dispatch}~\ocwlowerid{transition}~\ocwlowerid{trim\_tags}$\ocwenddcode{} \ocwec{}~\ocweol
 \ocwindent{0.00em}
-\ocwkw{open}~$\ocwupperid{Html};~$\ocweol
+\ocwkw{open}~$\ocwupperid{Html};~$\ocwbc{} html constructors \ocwec{}\ocweol
 \ocwindent{0.00em}
-\ocwkw{open}~$\ocwupperid{Web};~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{ps}~\ocwlowerid{pl}~\ocwlowerid{abort}~\ocwlowerid{reader\_cgi}~\ocwlowerid{scl\_toggle}$\ocwenddcode{} etc. \ocwec{}\ocweol
+\ocwkw{open}~$\ocwupperid{Web};~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{ps}~\ocwlowerid{pl}~\ocwlowerid{abort}~\ocwlowerid{reader\_cgi}~\ocwlowerid{scl\_toggle}$\ocwenddcode{} etc. \ocwec{}~\ocweol
 \ocwindent{0.00em}
-\ocwkw{open}~$\ocwupperid{Cgi};$\medskip
+\ocwkw{open}~$\ocwupperid{Cgi};~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{url}~\ocwlowerid{get}~\ocwlowerid{decode\_url}$\ocwenddcode{} \ocwec{}\medskip
 
-\label{interface.ml:1311}%
+\label{interface.ml:1381}%
 \ocwindent{0.00em}
 \ocwkw{module}~$\ocwupperid{Prel}~=~$\ocwkw{struct}~\ocwbc{} Interface's lexer prelude \ocwec{}\medskip
 
-\label{interface.ml:1365}%
+\label{interface.ml:1435}%
 \ocwindent{0.50em}
 $\ocwlowerid{value}~\ocwlowerid{prelude}~()~=~$\ocwkw{do}\ocweol
 \ocwindent{1.00em}
@@ -49885,7 +49831,7 @@ $\ocwlowerid{value}~\ocwlowerid{prelude}~()~=~$\ocwkw{do}\ocweol
 \ocwindent{0.00em}
 \ocwbc{} Service routines for morphological query, loading the morphology banks \ocwec{}\medskip
 
-\label{interface.ml:1918}%
+\label{interface.ml:1988}%
 \ocwindent{0.00em}
 \ocwkw{module}~$\ocwupperid{Lemmas}~=~\ocwupperid{Load\_morphs.Morphs}~\ocwupperid{Prel}~\ocwupperid{Phases}~$\ocweol
 \ocwindent{0.00em}
@@ -49921,7 +49867,7 @@ Viccheda sandhi splitting
 \ocwindent{0.00em}
 Global parameters of the lexer 
 \ocweol
-\label{interface.ml:2364}%
+\label{interface.ml:2434}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{iterate}~=~$\ocwbt{ref}~$\ocwupperid{True}~$\ocwbc{} by default a chunk is a list of words \ocwec{}\ocweol
@@ -49959,7 +49905,7 @@ $\ocwlowerid{value}~\ocwlowerid{out\_chan}~=~\ocwlowerid{output\_channel}$\ocweo
 \ocwendcode{}\ocwindent{0.00em}
 Separates tags of homophonous segments vertically 
 \ocweol
-\label{interface.ml:3020}%
+\label{interface.ml:3090}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{fold\_vert}~\ocwlowerid{f}~=~\ocwlowerid{fold}~1~\ocwlowerid{where}~$\ocwkw{rec}~$\ocwlowerid{fold}~\ocwlowerid{n}~=~$\ocwkw{fun}\ocweol
@@ -50050,12 +49996,12 @@ $]$\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Parsing mandatory checkpoints 
 \ocweol
-\label{interface.ml:5000}%
+\label{interface.ml:5070}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 \ocwkw{open}~$\ocwupperid{Checkpoints};~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{string\_points}$\ocwenddcode{} \ocwec{}\medskip
 
-\label{interface.ml:5042}%
+\label{interface.ml:5112}%
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{rpc}~=~\ocwupperid{Paths.}\ocwlowerid{remote\_server\_host}~$\ocweol
 \ocwindent{0.00em}
@@ -50158,9 +50104,9 @@ $\ocwupperid{List.}\ocwlowerid{sort}~\ocwlowerid{compare\_index}~\ocwlowerid{cpt
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{seg\_length}~=~$\ocwkw{fun}\ocweol
 \ocwindent{0.50em}
-$[~[~-2~::~\ocwlowerid{rest}~]~\rightarrow{}~\ocwupperid{Word.}\ocwlowerid{length}~\ocwlowerid{rest}~$\ocweol
+$[~[~-2~::~\ocwlowerid{rest}~]~\rightarrow{}~\ocwupperid{Word.}\ocwlowerid{length}~\ocwlowerid{rest}~$\ocwbc{} lopa does not count \ocwec{}\ocweol
 \ocwindent{0.50em}
-$\mid{}~\ocwlowerid{w}~\rightarrow{}~\ocwupperid{Word.}\ocwlowerid{length}~\ocwlowerid{w}$\ocweol
+$\mid{}~\ocwlowerid{w}~\rightarrow{}~\ocwupperid{Word.}\ocwlowerid{length}~\ocwlowerid{w}~$\ocweol
 \ocwindent{0.50em}
 $]$\ocweol
 \ocwindent{0.00em}
@@ -50653,7 +50599,7 @@ $]~$\ocwkw{in}~\ocwkw{do}\ocweol
 \ocwindent{4.00em}
 \ocwkw{if}~$\ocwlowerid{scl\_toggle}~$\ocwkw{then}\ocweol
 \ocwindent{5.50em}
-$\ocwlowerid{ps}~(\ocwlowerid{td\_wrap}~(\ocwlowerid{call\_reader}~\ocwlowerid{text}~\ocwlowerid{cpts}~$\ocwstring{"o"}~\^{}~\ocwstring{"UoH\ocwvspace{}Analysis\ocwvspace{}Mode"}$))$\ocweol
+$\ocwlowerid{td\_wrap}~(\ocwlowerid{call\_reader}~\ocwlowerid{text}~\ocwlowerid{cpts}~$\ocwstring{"o"}~\^{}~\ocwstring{"UoH\ocwvspace{}Analysis\ocwvspace{}Mode"}$)~|\ensuremath{>}~\ocwlowerid{ps}$\ocweol
 \ocwindent{4.00em}
 \ocwkw{else}~$()~$\ocwbc{} \ocwbegindcode{}$\ocwlowerid{scl\_parser}$\ocwenddcode{} is not visible unless toggle is set \ocwec{}~\ocwkw{in}\ocweol
 \ocwindent{2.00em}
@@ -50768,7 +50714,7 @@ $]~$\^{}\ocweol
 \ocwendcode{}\ocwindent{0.00em}
 Cache management 
 \ocweol
-\label{interface.ml:19113}%
+\label{interface.ml:19210}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{make\_cache\_transducer}~(\ocwlowerid{cache}~:~\ocwupperid{Morphology.}\ocwlowerid{inflected\_map})~=~$\ocweol
@@ -50785,7 +50731,7 @@ $\ocwlowerid{value}~\ocwlowerid{make\_cache\_transducer}~(\ocwlowerid{cache}~:~\
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
-\ocwbc{} We fill gendered entries incrementally in a \ocwbegindcode{}$\ocwlowerid{public\_cache\_txt\_file}$\ocwenddcode{} \ocwec{}\ocweol
+\ocwbc{} We fill gendered entries incrementally in \ocwbegindcode{}$\ocwlowerid{public\_cache\_txt\_file}$\ocwenddcode{} \ocwec{}\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{append\_cache}~\ocwlowerid{entry}~\ocwlowerid{gender}~=~$\ocweol
 \ocwindent{1.00em}
@@ -50835,7 +50781,7 @@ $])$\ocweol
 \ocwindent{1.00em}
 $\ocwlowerid{center\_begin}~$\^{}\ocweol
 \ocwindent{3.00em}
-$\ocwlowerid{cgi\_begin}~(\ocwupperid{Cgi.}\ocwlowerid{url}~\ocwlowerid{corpus\_manager\_cgi}~$\~{}$\ocwlowerid{fragment}:\ocwlowerid{sentno})~$\ocwstring{""}~\^{}\ocweol
+$\ocwlowerid{cgi\_begin}~(\ocwlowerid{url}~\ocwlowerid{corpus\_manager\_cgi}~$\~{}$\ocwlowerid{fragment}:\ocwlowerid{sentno})~$\ocwstring{""}~\^{}\ocweol
 \ocwindent{5.50em}
 $\ocwlowerid{hidden\_input}~\ocwupperid{Params.}\ocwlowerid{corpus\_dir}~\ocwlowerid{corpdir}~$\^{}\ocweol
 \ocwindent{5.50em}
@@ -50859,7 +50805,14 @@ $\ocwlowerid{value}~\ocwlowerid{graph\_engine}~()~=~$\ocwkw{do}\ocweol
 \ocwindent{2.00em}
 \ocwkw{let}~$\ocwlowerid{env}~=~\ocwlowerid{create\_env}~\ocwlowerid{query}~$\ocwkw{in}\ocweol
 \ocwindent{2.00em}
-\ocwkw{let}~$\ocwlowerid{url\_encoded\_input}~=~\ocwlowerid{get}~$\ocwstring{"text"}~$\ocwlowerid{env}~$\ocwstring{""}\ocweol
+\ocwbc{} Multiple environment variables according to modes of use are: 
+       text topic st cp us t lex cache abs cpts (standard mode) 
+       allSol (deprecated Validate mode)
+       corpus sentenceNumber linkNumber (Corpus mode)
+       corpdir sentno corpmode (defined in Params) 
+       guess gender revised \ocwbegindcode{}$\ocwlowerid{rev\_off}$\ocwenddcode{} \ocwbegindcode{}$\ocwlowerid{rev\_ind}$\ocwenddcode{} (User-aid) \ocwec{}\ocweol
+\ocwindent{2.00em}
+\ocwkw{let}~$\ocwlowerid{url\_encoded\_input}~=~\ocwlowerid{get}~$\ocwstring{"text"}~$\ocwlowerid{env}~$\ocwstring{""}~\ocweol
 \ocwindent{2.00em}
 \ocwkw{and}~$\ocwlowerid{url\_encoded\_topic}~=~\ocwlowerid{get}~$\ocwstring{"topic"}~$\ocwlowerid{env}~$\ocwstring{""}~\ocwbc{} topic carry-over \ocwec{}\ocweol
 \ocwindent{2.00em}
@@ -50899,21 +50852,21 @@ $\ocwlowerid{value}~\ocwlowerid{graph\_engine}~()~=~$\ocwkw{do}\ocweol
 \ocwindent{2.00em}
 \ocwkw{and}~$\ocwlowerid{sol\_num}~=~\ocwlowerid{get}~$\ocwstring{"allSol"}~$\ocwlowerid{env}~$\ocwstring{"0"}~\ocwkw{in}~\ocwbc{} Needed for Validate mode \ocwec{}\ocweol
 \ocwindent{2.00em}
-\ocwkw{let}~$\ocwlowerid{url\_enc\_corpus\_permission}~=$\ocweol
+\ocwkw{let}~$\ocwlowerid{url\_enc\_corpus\_permission}~=~$\ocwbc{} Corpus mode \ocwec{}\ocweol
 \ocwindent{4.00em}
-$\ocwupperid{Cgi.}\ocwlowerid{get}~\ocwupperid{Params.}\ocwlowerid{corpus\_permission}~\ocwlowerid{env}~$\ocwstring{"true"}~\ocwkw{in}\ocweol
+$\ocwlowerid{get}~\ocwupperid{Params.}\ocwlowerid{corpus\_permission}~\ocwlowerid{env}~$\ocwstring{"true"}~\ocwkw{in}\ocweol
 \ocwindent{2.00em}
-\ocwkw{let}~$\ocwlowerid{corpus\_permission}~=$\ocweol
+\ocwkw{let}~$\ocwlowerid{corpus\_permission}~=~$\ocweol
 \ocwindent{3.00em}
 $\ocwlowerid{url\_enc\_corpus\_permission}$\ocweol
 \ocwindent{3.00em}
-|\ensuremath{>}~$\ocwupperid{Cgi.}\ocwlowerid{decode\_url}$\ocweol
+|\ensuremath{>}~$\ocwlowerid{decode\_url}$\ocweol
 \ocwindent{3.00em}
 |\ensuremath{>}~$\ocwupperid{Web\_corpus.}\ocwlowerid{permission\_of\_string}~$\ocwkw{in}\ocweol
 \ocwindent{2.00em}
-\ocwkw{let}~$\ocwlowerid{corpus\_dir}~=~\ocwupperid{Cgi.}\ocwlowerid{get}~\ocwupperid{Params.}\ocwlowerid{corpus\_dir}~\ocwlowerid{env}~$\ocwstring{""}~\ocwkw{in}\ocweol
+\ocwkw{let}~$\ocwlowerid{corpus\_dir}~=~\ocwlowerid{get}~\ocwupperid{Params.}\ocwlowerid{corpus\_dir}~\ocwlowerid{env}~$\ocwstring{""}~\ocwkw{in}\ocweol
 \ocwindent{2.00em}
-\ocwkw{let}~$\ocwlowerid{sentence\_no}~=~\ocwupperid{Cgi.}\ocwlowerid{get}~\ocwupperid{Params.}\ocwlowerid{sentence\_no}~\ocwlowerid{env}~$\ocwstring{""}~\ocwkw{in}\ocweol
+\ocwkw{let}~$\ocwlowerid{sentence\_no}~=~\ocwlowerid{get}~\ocwupperid{Params.}\ocwlowerid{sentence\_no}~\ocwlowerid{env}~$\ocwstring{""}~\ocwkw{in}\ocweol
 \ocwindent{2.00em}
 \ocwkw{let}~$\ocwlowerid{text}~=~\ocwlowerid{arguments}~\ocwlowerid{translit}~\ocwlowerid{lex}~\ocwlowerid{cache}~\ocwlowerid{st}~\ocwlowerid{us}~\ocwlowerid{cp}~\ocwlowerid{url\_encoded\_input}$\ocweol
 \ocwindent{12.50em}
@@ -50929,12 +50882,14 @@ $\ocwlowerid{parse\_cpts}~(\ocwlowerid{decode\_url}~\ocwlowerid{url\_encoded\_cp
 \ocwindent{3.00em}
 \ocwkw{with}~$[~\ocwupperid{Not\_found}~\rightarrow{}~[\,]~]$\ocweol
 \ocwindent{2.00em}
-\ocwkw{and}~$\ocwlowerid{guess\_morph}~=~\ocwlowerid{decode\_url}~(\ocwlowerid{get}~$\ocwstring{"guess"}~$\ocwlowerid{env}~$\ocwstring{""}$)~$\ocweol
+\ocwkw{and}~$\ocwlowerid{guess\_morph}~=~\ocwlowerid{decode\_url}~(\ocwlowerid{get}~$\ocwstring{"guess"}~$\ocwlowerid{env}~$\ocwstring{""}$)~$\ocwbc{} User-aid guessing \ocwec{}\ocweol
 \ocwindent{2.00em}
 \ocwkw{and}~$\ocwlowerid{pseudo\_gender}~=~\ocwlowerid{decode\_url}~(\ocwlowerid{get}~$\ocwstring{"gender"}~$\ocwlowerid{env}~$\ocwstring{""}$)~$\ocwkw{in}~\ocweol
 \ocwindent{2.00em}
 \ocwkw{let}~$\ocwlowerid{\_}~=~$\ocwkw{if}~$\ocwupperid{String.}\ocwlowerid{length}~\ocwlowerid{guess\_morph}~>~0~\land{}~\ocwupperid{Paths.}\ocwlowerid{platform}=$\ocwstring{"Station"}~\ocwkw{then}\ocweol
 \ocwindent{7.50em}
+\ocwbc{} User-aid cache acquisition \ocwec{}\ocweol
+\ocwindent{7.50em}
 \ocwkw{let}~$(\ocwlowerid{entry},\ocwlowerid{gender})~=~$\ocwkw{match}~$\ocwlowerid{pseudo\_gender}~$\ocwkw{with}~\ocweol
 \ocwindent{18.00em}
 $[~$\ocwstring{""}~$\rightarrow{}~\ocwlowerid{parse\_guess}~\ocwlowerid{guess\_morph}~$\ocweol
@@ -50955,9 +50910,9 @@ $\ocwlowerid{make\_cache\_transducer}~\ocwlowerid{cache}$\ocweol
 \ocwindent{6.00em}
 \ocwkw{else}~$()~$\ocwkw{in}\ocweol
 \ocwindent{2.00em}
-\ocwkw{let}~$\ocwlowerid{revised}~=~\ocwlowerid{decode\_url}~(\ocwlowerid{get}~$\ocwstring{"revised"}~$\ocwlowerid{env}~$\ocwstring{""}$)$\ocweol
+\ocwkw{let}~$\ocwlowerid{revised}~=~\ocwlowerid{decode\_url}~(\ocwlowerid{get}~$\ocwstring{"revised"}~$\ocwlowerid{env}~$\ocwstring{""}$)~$\ocwbc{} User-aid revision \ocwec{}\ocweol
 \ocwindent{2.00em}
-\ocwkw{and}~$\ocwlowerid{rev\_off}~=~\ocwlowerid{int\_of\_string}~(\ocwlowerid{get}~$\ocwstring{"rev\_off"}~$\ocwlowerid{env}~$\ocwstring{"\symbol{45}1"}$)$\ocweol
+\ocwkw{and}~$\ocwlowerid{rev\_off}~=~\ocwlowerid{int\_of\_string}~(\ocwlowerid{get}~$\ocwstring{"rev\_off"}~$\ocwlowerid{env}~$\ocwstring{"\symbol{45}1"}$)~$\ocweol
 \ocwindent{2.00em}
 \ocwkw{and}~$\ocwlowerid{rev\_ind}~=~\ocwlowerid{int\_of\_string}~(\ocwlowerid{get}~$\ocwstring{"rev\_ind"}~$\ocwlowerid{env}~$\ocwstring{"\symbol{45}1"}$)~$\ocwkw{in}~\ocweol
 \ocwindent{1.50em}
@@ -50965,11 +50920,13 @@ $\ocwlowerid{make\_cache\_transducer}~\ocwlowerid{cache}$\ocweol
 \ocwindent{1.50em}
 \{~\ocwkw{match}~$(\ocwlowerid{revised},\ocwlowerid{rev\_off},\ocwlowerid{rev\_ind})~$\ocwkw{with}\ocweol
 \ocwindent{2.50em}
-$[~($\ocwstring{""},-1,-1$)~\rightarrow{}~\ocwlowerid{check\_sentence}~\ocwlowerid{translit}~\ocwlowerid{uns}~\ocwlowerid{text}~\ocwlowerid{checkpoints}~$\ocweol
-\ocwindent{18.00em}
-$\ocwlowerid{input}~\ocwlowerid{sol\_num}~\ocwlowerid{corpus}~\ocwlowerid{sent\_id}~\ocwlowerid{link\_num}$\ocweol
+$[~($\ocwstring{""},-1,-1$)~\rightarrow{}~$\ocwbc{} Standard input processing *** main call *** \ocwec{}\ocweol
+\ocwindent{3.50em}
+$\ocwlowerid{check\_sentence}~\ocwlowerid{translit}~\ocwlowerid{uns}~\ocwlowerid{text}~\ocwlowerid{checkpoints}~\ocwlowerid{input}~\ocwlowerid{sol\_num}$\ocweol
+\ocwindent{11.00em}
+$\ocwlowerid{corpus}~\ocwlowerid{sent\_id}~\ocwlowerid{link\_num}$\ocweol
 \ocwindent{2.50em}
-$\mid{}~(\ocwlowerid{new\_word},\ocwlowerid{word\_off},\ocwlowerid{chunk\_ind})~\rightarrow{}~$\ocweol
+$\mid{}~(\ocwlowerid{new\_word},\ocwlowerid{word\_off},\ocwlowerid{chunk\_ind})~$\ocwbc{} User-aid revision \ocwec{}~$\rightarrow{}~$\ocweol
 \ocwindent{3.50em}
 \ocwkw{let}~$\ocwlowerid{chunks}~=~\ocwupperid{Sanskrit.}\ocwlowerid{read\_sanskrit}~(\ocwupperid{Encode.}\ocwlowerid{switch\_code}~\ocwlowerid{translit})~\ocwlowerid{input}~$\ocwkw{in}\ocweol
 \ocwindent{3.50em}
@@ -51001,9 +50958,9 @@ $\mid{}~[~\ocwlowerid{a}~::~\ocwlowerid{rest}~]~\rightarrow{}~$\ocwkw{if}~$\ocwl
 \ocwindent{5.50em}
 $]~$\ocwkw{in}\ocweol
 \ocwindent{3.50em}
-\ocwkw{let}~$\ocwlowerid{word\_len}~=~\ocwlowerid{find\_word\_len}~1~\ocwlowerid{chunks}~$\ocwkw{in}\ocweol
+\ocwkw{let}~$\ocwlowerid{word\_len}~=~\ocwlowerid{find\_word\_len}~1~\ocwlowerid{chunks}~$\ocweol
 \ocwindent{3.50em}
-\ocwkw{let}~$\ocwlowerid{new\_chunk\_len}~=~\ocwupperid{Word.}\ocwlowerid{length}~(\ocwupperid{Encode.}\ocwlowerid{switch\_code}~\ocwlowerid{translit}~\ocwlowerid{revised})~$\ocwkw{in}\ocweol
+\ocwkw{and}~$\ocwlowerid{new\_chunk\_len}~=~\ocwupperid{Word.}\ocwlowerid{length}~(\ocwupperid{Encode.}\ocwlowerid{switch\_code}~\ocwlowerid{translit}~\ocwlowerid{revised})~$\ocwkw{in}\ocweol
 \ocwindent{3.50em}
 \ocwkw{let}~$\ocwlowerid{diff}~=~\ocwlowerid{new\_chunk\_len}-\ocwlowerid{word\_len}~$\ocwkw{in}\ocweol
 \ocwindent{3.50em}
@@ -51056,10 +51013,10 @@ $\ocwlowerid{save\_button}~\ocwlowerid{query}~(\ocwupperid{Num.}\ocwlowerid{num\
                   or quit without saving (annotator mode) \ocwec{}\ocweol
 \ocwindent{1.50em}
 ;~\ocwkw{if}~$\ocwlowerid{sentence\_no}~\not=~$\ocwstring{""}~\ocwkw{then}\ocweol
-\ocwindent{3.50em}
+\ocwindent{4.00em}
 $\ocwlowerid{quit\_button}~\ocwlowerid{corpus\_permission}$\ocweol
-\ocwindent{4.50em}
-$(\ocwupperid{Cgi.}\ocwlowerid{decode\_url}~\ocwlowerid{corpus\_dir})~(\ocwupperid{Cgi.}\ocwlowerid{decode\_url}~\ocwlowerid{sentence\_no})~|\ensuremath{>}~\ocwlowerid{pl}$\ocweol
+\ocwindent{10.00em}
+$(\ocwlowerid{decode\_url}~\ocwlowerid{corpus\_dir})~(\ocwlowerid{decode\_url}~\ocwlowerid{sentence\_no})~|\ensuremath{>}~\ocwlowerid{pl}$\ocweol
 \ocwindent{2.50em}
 \ocwkw{else}~$()$\ocweol
 \ocwindent{1.50em}
@@ -51986,7 +51943,7 @@ $\ocwlowerid{value}~\ocwlowerid{html\_break}~=~\ocwlowerid{xml\_empty}~$\ocwstri
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
-\ocwbc{} array operations \ocwec{}\ocweol
+\ocwbc{} Array operations \ocwec{}\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{tr\_begin}~=~\ocwlowerid{xml\_begin}~$\ocwstring{"tr"}\ocweol
 \ocwindent{0.00em}
@@ -52158,9 +52115,7 @@ $[~($\ocwstring{"type"},~\ocwstring{"number"}$)$\ocweol
 \ocwindent{2.00em}
 ;~$($\ocwstring{"max"},~$\ocwlowerid{string\_of\_int}~\ocwlowerid{max})$\ocweol
 \ocwindent{2.00em}
-$]$\ocweol
-\ocwindent{1.00em}
-\ocwkw{in}\ocweol
+$]~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
 \ocwkw{let}~$\ocwlowerid{opt\_attrs}~=$\ocweol
 \ocwindent{2.00em}
@@ -52168,9 +52123,7 @@ $[~($\ocwstring{"id"},~$\ocwlowerid{id})$\ocweol
 \ocwindent{2.00em}
 ;~$($\ocwstring{"value"},~$\ocwupperid{Gen.}\ocwlowerid{opt\_app}~\ocwlowerid{string\_of\_int}~$\ocwkw{val}$)$\ocweol
 \ocwindent{2.00em}
-$]$\ocweol
-\ocwindent{1.00em}
-\ocwkw{in}\ocweol
+$]~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
 \ocwkw{let}~$\ocwlowerid{attrs}~=~\ocwlowerid{add\_opt\_attrs}~\ocwlowerid{opt\_attrs}~\ocwlowerid{attrs}~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
@@ -52232,7 +52185,7 @@ Lists
 \ocwindent{0.00em}
 List item 
 \ocweol
-\label{html.ml:5893}%
+\label{html.ml:5889}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{li}~?\ocwlowerid{id}~\ocwlowerid{item}~=$\ocweol
@@ -52251,41 +52204,25 @@ $\ocwlowerid{value}~\ocwlowerid{ol}~?\ocwlowerid{id}~?\ocwlowerid{li\_id\_prefix
 \ocwindent{1.00em}
 \ocwkw{let}~$\ocwlowerid{ol}~=~$\ocwstring{"ol"}~\ocwkw{in}\ocweol
 \ocwindent{1.00em}
-\ocwkw{let}~$\ocwlowerid{items}~=$\ocweol
+\ocwkw{let}~$\ocwlowerid{process}~\ocwlowerid{i}~\ocwlowerid{item}~=~$\ocweol
 \ocwindent{2.00em}
-$\ocwupperid{List.}\ocwlowerid{mapi}~($\ocwkw{fun}~$\ocwlowerid{i}~\ocwlowerid{item}~\rightarrow{}$\ocweol
-\ocwindent{4.00em}
-\ocwkw{let}~$\ocwlowerid{id}~=$\ocweol
-\ocwindent{5.00em}
-\ocwkw{let}~$\ocwlowerid{genid}~\ocwlowerid{prefix}~=~\ocwlowerid{prefix}~$\^{}~$\ocwlowerid{string\_of\_int}~(\ocwlowerid{start}~+~\ocwlowerid{i})~$\ocwkw{in}\ocweol
-\ocwindent{5.00em}
-$\ocwupperid{Gen.}\ocwlowerid{opt\_app}~\ocwlowerid{genid}~\ocwlowerid{li\_id\_prefix}$\ocweol
-\ocwindent{4.00em}
-\ocwkw{in}\ocweol
-\ocwindent{4.00em}
-$\ocwlowerid{li}~?\ocwlowerid{id}~\ocwlowerid{item}$\ocweol
-\ocwindent{3.00em}
-$)~\ocwlowerid{items}$\ocweol
+\ocwkw{let}~$\ocwlowerid{id}~=~$\ocwkw{let}~$\ocwlowerid{genid}~\ocwlowerid{prefix}~=~\ocwlowerid{prefix}~$\^{}~$\ocwlowerid{string\_of\_int}~(\ocwlowerid{start}~+~\ocwlowerid{i})~$\ocwkw{in}\ocweol
+\ocwindent{6.50em}
+$\ocwupperid{Gen.}\ocwlowerid{opt\_app}~\ocwlowerid{genid}~\ocwlowerid{li\_id\_prefix}~$\ocwkw{in}\ocweol
+\ocwindent{2.00em}
+$\ocwlowerid{li}~?\ocwlowerid{id}~\ocwlowerid{item}~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
-\ocwkw{in}\ocweol
+\ocwkw{let}~$\ocwlowerid{lines}~=~\ocwupperid{List.}\ocwlowerid{mapi}~\ocwlowerid{process}~\ocwlowerid{items}~$\ocwkw{in}~\ocweol
 \ocwindent{1.00em}
-\ocwkw{let}~\ocwbt{list}~=~$\ocwupperid{String.}\ocwlowerid{concat}~$\ocwstring{"\symbol{92}n"}~$\ocwlowerid{items}~$\ocwkw{in}\ocweol
+\ocwkw{let}~\ocwbt{list}~=~$\ocwupperid{String.}\ocwlowerid{concat}~$\ocwstring{"\symbol{92}n"}~$\ocwlowerid{lines}~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
 \ocwkw{let}~$\ocwlowerid{attrs}~=$\ocweol
 \ocwindent{2.00em}
-$\ocwlowerid{add\_opt\_attrs}~[~($\ocwstring{"id"},~$\ocwlowerid{id})~]~[~($\ocwstring{"start"},~$\ocwlowerid{string\_of\_int}~\ocwlowerid{start})~]$\ocweol
+$\ocwlowerid{add\_opt\_attrs}~[~($\ocwstring{"id"},~$\ocwlowerid{id})~]~[~($\ocwstring{"start"},~$\ocwlowerid{string\_of\_int}~\ocwlowerid{start})~]~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
-\ocwkw{in}\ocweol
-\ocwindent{1.00em}
-$\ocwlowerid{xml\_begin\_with\_att}~\ocwlowerid{ol}~\ocwlowerid{attrs}~$\^{}~\ocwstring{"\symbol{92}n"}~\^{}\ocweol
-\ocwindent{1.00em}
-\ocwbt{list}~\^{}~\ocwstring{"\symbol{92}n"}~\^{}\ocweol
-\ocwindent{1.00em}
-$\ocwlowerid{xml\_end}~\ocwlowerid{ol}$\ocweol
+$\ocwlowerid{xml\_begin\_with\_att}~\ocwlowerid{ol}~\ocwlowerid{attrs}~$\^{}~\ocwstring{"\symbol{92}n"}~\^{}~\ocwbt{list}~\^{}~\ocwstring{"\symbol{92}n"}~\^{}~$\ocwlowerid{xml\_end}~\ocwlowerid{ol}$\ocweol
 \ocwindent{0.00em}
-;\medskip
-
-\label{html.ml:6536}%
+;\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{fieldn}~\ocwlowerid{name}~\ocwlowerid{content}~=~[~($\ocwstring{"name"},$\ocwlowerid{name});~($\ocwstring{"content"},$\ocwlowerid{content})~]$\ocweol
 \ocwindent{0.00em}
@@ -52313,23 +52250,6 @@ $\mid{}~\ocwupperid{Lawngreen}~\mid{}~\ocwupperid{Deep\_pink}~\mid{}~\ocwupperid
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
-\ocwbc{} TO be relocated \ocwbegindcode{}
-\ocwkw{type}~$\ocwlowerid{pict}~=~$\ocwbt{string}~$(\times{}~\ocwlowerid{misc}~\ocwlowerid{background}~\ocwlowerid{pictures}~\times{})
-~[~\ocwupperid{Om}~\mid{}~\ocwupperid{Om2}~\mid{}~\ocwupperid{Om3}~\mid{}~\ocwupperid{Om4}~\mid{}~\ocwupperid{Gan}~\mid{}~\ocwupperid{Hare}~\mid{}~\ocwupperid{Geo}~]~
-;~
-(\times{}~\ocwupperid{Deprecated},~$\ocwkw{for}~$\ocwlowerid{use}~$\ocwkw{as}~$\ocwlowerid{background}~\ocwlowerid{pictures}~\ocwlowerid{like}~$\ocwkw{in}~$\ocwlowerid{the}~\ocwlowerid{ancient}~\ocwupperid{Web}...~\times{})
-(\times{}~\ocwupperid{Problematic},~\ocwlowerid{since}~\ocwlowerid{pollutes}~$\ocwkw{with}~$\ocwlowerid{installation}-\ocwlowerid{dependent}~\ocwupperid{URLs}~\times{})
-\ocwlowerid{value}~\ocwlowerid{pict}~=~$\ocwkw{fun}~
-~[~\ocwstring{"Om"}~$\rightarrow{}~\ocwupperid{Install}.\ocwlowerid{om\_jpg}~
-~\mid{}~$\ocwstring{"Om2"}~$\rightarrow{}~\ocwupperid{Install}.\ocwlowerid{om2\_jpg}
-~\mid{}~$\ocwstring{"Om3"}~$\rightarrow{}~\ocwupperid{Install}.\ocwlowerid{om3\_jpg}~
-~\mid{}~$\ocwstring{"Om4"}~$\rightarrow{}~\ocwupperid{Install}.\ocwlowerid{om4\_jpg}
-~\mid{}~$\ocwstring{"Gan"}~$\rightarrow{}~\ocwupperid{Install}.\ocwlowerid{ganesh\_gif}~
-~\mid{}~$\ocwstring{"Geo"}~$\rightarrow{}~\ocwupperid{Install}.\ocwlowerid{geo\_gif}
-~\mid{}~$\ocwstring{"Hare"}~$\rightarrow{}~\ocwupperid{Install}.\ocwlowerid{hare\_jpg}~
-~]~
-;$\ocwenddcode{} \ocwec{}\ocweol
-\ocwindent{0.00em}
 \ocwkw{type}~$\ocwlowerid{basic\_style}~=~$\ocweol
 \ocwindent{1.00em}
 $[~\ocwupperid{Font\_family}~$\ocwkw{of}~$\ocwlowerid{font\_family}~$\ocweol
@@ -52605,8 +52525,6 @@ $\mid{}~\ocwupperid{Deep\_sky\_back}~\mid{}~\ocwupperid{Carmin\_back}~\mid{}~\oc
 $\mid{}~\ocwupperid{Lavender\_back}~\mid{}~\ocwupperid{Lavender\_cent}~\mid{}~\ocwupperid{Green\_back}~\mid{}~\ocwupperid{Lawngreen\_back}~\mid{}~\ocwupperid{Magenta\_back}$\ocweol
 \ocwindent{2.00em}
 $\mid{}~\ocwupperid{Aquamarine\_back}~\mid{}~\ocwupperid{Hidden\_}$\ocweol
-\ocwindent{0.00em}
-\ocwbc{}\ocwbegindcode{}~$\mid{}~\ocwupperid{Pict\_om}~\mid{}~\ocwupperid{Pict\_om2}~\mid{}~\ocwupperid{Pict\_om3}~\mid{}~\ocwupperid{Pict\_om4}~\mid{}~\ocwupperid{Pict\_gan}~\mid{}~\ocwupperid{Pict\_hare}~\mid{}~\ocwupperid{Pict\_geo}~$\ocwenddcode{}\ocwec{}\ocweol
 \ocwindent{2.00em}
 $]$\ocweol
 \ocwindent{0.00em}
@@ -52832,7 +52750,7 @@ $]$\ocweol
 \ocwindent{0.00em}
 \ocwbc{} Compiles a class into its style for non-css compliant browsers \ocwec{}\ocweol
 \ocwindent{0.00em}
-\ocwbc{} Mostly used by Css to compile the css style sheet \ocwec{}\ocweol
+\ocwbc{} Nowadays mostly used by Css to compile the css style sheet     \ocwec{}\ocweol
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{style}~\ocwlowerid{cla}~=~\ocwupperid{String.}\ocwlowerid{concat}~$\ocwstring{";\ocwvspace{}"}~$(\ocwupperid{List.}\ocwlowerid{map}~\ocwlowerid{style\_sheet}~(\ocwlowerid{styles}~\ocwlowerid{cla}))~$\ocweol
 \ocwindent{0.00em}
@@ -52990,7 +52908,7 @@ $\ocwlowerid{value}~\ocwlowerid{elt\_begin\_attrs}~\ocwlowerid{attrs}~\ocwloweri
 \ocwindent{1.00em}
 \ocwkw{let}~$\ocwlowerid{style\_attr}~=~$\ocwbc{} if Install.css then \ocwec{}~$($\ocwstring{"class"},$\ocwlowerid{class\_of}~\ocwlowerid{cl})~$\ocweol
 \ocwindent{16.50em}
-\ocwbc{}  else (\ocwstring{"style"},style cl) \ocwec{}~\ocwkw{in}\ocweol
+\ocwbc{}  else    (\ocwstring{"style"},style cl) \ocwec{}~\ocwkw{in}\ocweol
 \ocwindent{1.00em}
 $\ocwlowerid{xml\_begin\_with\_att}~\ocwlowerid{elt}~[~\ocwlowerid{style\_attr}~::~\ocwlowerid{attrs}~]~$\ocweol
 \ocwindent{0.00em}
@@ -53020,7 +52938,7 @@ $\ocwlowerid{value}~\ocwlowerid{par\_begin}~=~\ocwlowerid{elt\_begin}~$\ocwstrin
 \ocwindent{1.00em}
 $\ocwlowerid{where}~\ocwlowerid{margins}~=~[~($\ocwstring{"style"},\ocwstring{"margin\symbol{45}left:\ocwvspace{}0;\ocwvspace{}margin\symbol{45}right:\ocwvspace{}0;\ocwvspace{}margin\symbol{45}top:\ocwvspace{}0;"}$)~]$\ocweol
 \ocwindent{0.00em}
-\ocwbc{} \ocwbegindcode{}$\ocwlowerid{table\_begin\_style}$\ocwenddcode{} not compliant with HTML5 (dynamic style)      \ocwec{}\ocweol
+\ocwbc{} Caution: \ocwbegindcode{}$\ocwlowerid{table\_begin\_style}$\ocwenddcode{} is not compliant with HTML5 (dynamic style)    \ocwec{}\ocweol
 \ocwindent{0.00em}
 \ocwkw{and}~$\ocwlowerid{table\_begin\_style}~\ocwlowerid{style}~\ocwlowerid{attrs}~=~\ocwlowerid{elt\_begin\_attrs}~\ocwlowerid{attrs}~$\ocwstring{"table"}~$\ocwlowerid{style}$\ocweol
 \ocwindent{0.00em}
@@ -53080,23 +52998,19 @@ $\ocwlowerid{value}~\ocwlowerid{span}~\ocwlowerid{style}~\ocwlowerid{text}~=~\oc
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{center}~=~\ocwlowerid{div}~\ocwupperid{Center\_}$\ocweol
+\ocwbc{} Centering old style - deprecated \ocwec{}\ocweol
+\ocwindent{0.00em}
+$\ocwlowerid{value}~\ocwlowerid{center}~=~\ocwlowerid{div}~\ocwupperid{Center\_}~$\ocweol
 \ocwindent{0.00em}
 \ocwkw{and}~$\ocwlowerid{center\_begin}~=~\ocwlowerid{div\_begin}~\ocwupperid{Center\_}~$\ocweol
 \ocwindent{0.00em}
 \ocwkw{and}~$\ocwlowerid{center\_end}~=~\ocwlowerid{div\_end}$\ocweol
 \ocwindent{0.00em}
-;\ocweol
-\ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{center\_image}~\ocwlowerid{name}~\ocwlowerid{caption}~=~$\ocweol
-\ocwindent{1.00em}
-$\ocwlowerid{center}~(\ocwlowerid{xml\_empty\_with\_att}~$\ocwstring{"img"}~$[~($\ocwstring{"src"},$\ocwlowerid{name});~($\ocwstring{"alt"},$\ocwlowerid{caption})~])$\ocweol
-\ocwindent{0.00em}
-;\ocweol
+;~\ocweol
 \ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{html\_red}~=~\ocwlowerid{span}~\ocwupperid{Red\_}$\ocweol
+$\ocwlowerid{value}~\ocwlowerid{html\_red}~=~\ocwlowerid{span}~\ocwupperid{Red\_}~$\ocweol
 \ocwindent{0.00em}
-\ocwkw{and}~$\ocwlowerid{html\_devared}~=~\ocwlowerid{span\_skt}~\ocwupperid{Devared\_}$\ocweol
+\ocwkw{and}~$\ocwlowerid{html\_devared}~=~\ocwlowerid{span\_skt}~\ocwupperid{Devared\_}~$\ocweol
 \ocwindent{0.00em}
 \ocwkw{and}~$\ocwlowerid{html\_magenta}~=~\ocwlowerid{span}~\ocwupperid{Magenta\_}$\ocweol
 \ocwindent{0.00em}
@@ -53197,7 +53111,7 @@ $(\ocwlowerid{xml\_begin\_with\_att}~$\ocwstring{"a"}~$[~($\ocwstring{"href"},$\
 \ocwendcode{}\ocwindent{0.00em}
 Specific HTML scripting 
 \ocweol
-\label{html.ml:24895}%
+\label{html.ml:24235}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{start\_year}~=~$\ocwstring{"\ocwvspace{}1994\symbol{45}"}\ocweol
@@ -53220,7 +53134,7 @@ $\ocwlowerid{value}~\ocwlowerid{author}~=~\ocwlowerid{fieldn}~$\ocwstring{"autho
 \ocwindent{0.00em}
 \ocwkw{and}~$\ocwlowerid{keywords}~=~\ocwlowerid{fieldn}~$\ocwstring{"keywords"}~\ocweol
 \ocwindent{2.00em}
-\ocwstring{"dictionary,sanskrit,heritage,dictionnaire,sanscrit,india,inde,indology,linguistics,panini,digital\ocwvspace{}humanities,cultural\ocwvspace{}heritage,computational\ocwvspace{}linguistics,hypertext\ocwvspace{}lexicon"}\ocweol
+\ocwstring{"sanskrit,dictionary,heritage,dictionnaire,sanscrit,india,inde,indology,linguistics,panini,digital\ocwvspace{}humanities,digital\ocwvspace{}libraries,cultural\ocwvspace{}heritage,computational\ocwvspace{}linguistics,hypertext\ocwvspace{}lexicon"}\ocweol
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
@@ -53228,8 +53142,6 @@ $\ocwlowerid{value}~\ocwlowerid{heritage\_dictionary\_title}~=~\ocwlowerid{title
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
-\ocwbc{} was in Install \ocwec{}\ocweol
-\ocwindent{0.00em}
 \ocwbc{} Supported publishing media \ocwec{}\ocweol
 \ocwindent{0.00em}
 \ocwkw{type}~$\ocwlowerid{medium}~=~[~\ocwupperid{Html}~\mid{}~\ocwupperid{Tex}~]$\ocweol
@@ -53248,7 +53160,7 @@ $\ocwlowerid{value}~\ocwlowerid{target}~=~$\ocwkw{match}~$\ocwupperid{Paths.}\oc
 \ocwindent{1.00em}
 $[~$\ocwstring{"Simputer"}~$\rightarrow{}~\ocwupperid{Simputer}~$\ocwbc{} Historical - small screen \ocwec{}\ocweol
 \ocwindent{1.00em}
-$\mid{}~$\ocwstring{"Smartphone"}~$\rightarrow{}~\ocwupperid{Simputer}~$\ocwbc{} Smartphone version not implemented yet \ocwec{}\ocweol
+$\mid{}~$\ocwstring{"Smartphone"}~$\mid{}~$\ocwstring{"Tablet"}~$\rightarrow{}~\ocwupperid{Simputer}~$\ocwbc{} TODO \ocwec{}\ocweol
 \ocwindent{1.00em}
 $\mid{}~$\ocwstring{"Computer"}~$\rightarrow{}~\ocwupperid{Computer}~$\ocwbc{} Standard client installation \ocwec{}\ocweol
 \ocwindent{1.00em}
@@ -53292,7 +53204,7 @@ $\ocwlowerid{value}~\ocwlowerid{lexicon\_of}~=~$\ocwkw{fun}~\ocweol
 \ocwindent{1.00em}
 $[~\ocwupperid{French}~\rightarrow{}~$\ocwstring{"SH"}~\ocwbc{} Sanskrit Heritage \ocwec{}~\ocweol
 \ocwindent{1.00em}
-$\mid{}~\ocwupperid{English}~\rightarrow{}~$\ocwstring{"MW"}~\ocwbc{} Monier-Williams \ocwec{}~\ocweol
+$\mid{}~\ocwupperid{English}~\rightarrow{}~$\ocwstring{"MW"}~\ocwbc{} Monier-Williams   \ocwec{}~\ocweol
 \ocwindent{1.00em}
 $]~$\ocweol
 \ocwindent{0.00em}
@@ -53428,7 +53340,7 @@ $\ocwlowerid{value}~\ocwlowerid{doctype}~=~$\ocwstring{"\ensuremath{<}!DOCTYPE\o
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{url}~\ocwlowerid{dns}~=~$\ocwstring{"http://"}~\^{}~$\ocwlowerid{dns};$\medskip
 
-\label{html.ml:28885}%
+\label{html.ml:28201}%
 \ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{ocaml\_site}~=~\ocwlowerid{url}~$\ocwstring{"ocaml.org"}\ocweol
 \ocwindent{0.00em}
@@ -53441,7 +53353,7 @@ $\ocwlowerid{value}~\ocwlowerid{ocaml\_site}~=~\ocwlowerid{url}~$\ocwstring{"oca
 \ocwendcode{}\ocwindent{0.00em}
 Button 
 \ocweol
-\label{html.ml:29069}%
+\label{html.ml:28385}%
 \medskip
 \ocwbegincode{}\ocwindent{0.00em}
 $\ocwlowerid{value}~\ocwlowerid{js\_string\_arg}~\ocwlowerid{s}~=$\ocweol
@@ -58909,9 +58821,7 @@ $[~\ocwupperid{Multilingual.Deva}~\rightarrow{}~\ocwupperid{Corpus.Encoding.Deva
 \ocwindent{4.00em}
 $\mid{}~\ocwupperid{Multilingual.Roma}~\rightarrow{}~\ocwupperid{Corpus.Encoding.IAST}$\ocweol
 \ocwindent{4.00em}
-$]$\ocweol
-\ocwindent{2.00em}
-\ocwkw{in}\ocweol
+$]~$\ocwkw{in}\ocweol
 \ocwindent{2.00em}
 \ocwkw{let}~$\ocwlowerid{text}~=~\ocwupperid{Corpus.Sentence.}\ocwlowerid{text}~\ocwlowerid{encoding}~\ocwlowerid{sentence}~$\ocwkw{in}\ocweol
 \ocwindent{2.00em}
@@ -58923,17 +58833,13 @@ $[~\ocwupperid{Multilingual.Deva}~\rightarrow{}~\ocwlowerid{deva16\_blue}$\ocweo
 \ocwindent{3.00em}
 $\mid{}~\ocwupperid{Multilingual.Roma}~\rightarrow{}~\ocwlowerid{span}~\ocwupperid{Trans16}$\ocweol
 \ocwindent{3.00em}
-$]$\ocweol
-\ocwindent{2.00em}
-\ocwkw{in}\ocweol
+$]~$\ocwkw{in}~\ocweol
 \ocwindent{2.00em}
 $\ocwlowerid{text}$\ocweol
 \ocwindent{2.00em}
 |\ensuremath{>}~$\ocwlowerid{anchor\_ref}~(\ocwlowerid{sentence}~|\ensuremath{>}~\ocwupperid{Web\_corpus.}\ocwlowerid{url}~\ocwlowerid{dir}~\ocwlowerid{permission}~|\ensuremath{>}~\ocwlowerid{escape})$\ocweol
 \ocwindent{2.00em}
-|\ensuremath{>}~$\ocwlowerid{display}$\ocweol
-\ocwindent{1.00em}
-\ocwkw{in}\ocweol
+|\ensuremath{>}~$\ocwlowerid{display}~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
 $\ocwupperid{List.}\ocwlowerid{map}~\ocwlowerid{to\_anchor\_ref}~\ocwlowerid{sentences}$\ocweol
 \ocwindent{0.00em}
@@ -58945,13 +58851,9 @@ $\ocwlowerid{value}~\ocwlowerid{section\_selection}~\ocwlowerid{dir}~\ocwlowerid
 \ocwindent{2.00em}
 \ocwkw{let}~$\ocwlowerid{prefixes}~=$\ocweol
 \ocwindent{3.00em}
-$\ocwupperid{List.}\ocwlowerid{map}~($\ocwkw{fun}~$\ocwlowerid{x}~\rightarrow{}~\ocwupperid{Filename.}\ocwlowerid{concat}~\ocwlowerid{dir}~\ocwlowerid{x})~\ocwlowerid{sections}$\ocweol
+$\ocwupperid{List.}\ocwlowerid{map}~($\ocwkw{fun}~$\ocwlowerid{x}~\rightarrow{}~\ocwupperid{Filename.}\ocwlowerid{concat}~\ocwlowerid{dir}~\ocwlowerid{x})~\ocwlowerid{sections}~$\ocwkw{in}\ocweol
 \ocwindent{2.00em}
-\ocwkw{in}\ocweol
-\ocwindent{2.00em}
-$\ocwupperid{List.}\ocwlowerid{combine}~\ocwlowerid{prefixes}~\ocwlowerid{sections}$\ocweol
-\ocwindent{1.00em}
-\ocwkw{in}\ocweol
+$\ocwupperid{List.}\ocwlowerid{combine}~\ocwlowerid{prefixes}~\ocwlowerid{sections}~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
 $\ocwlowerid{option\_select\_label}~\ocwupperid{Params.}\ocwlowerid{corpus\_dir}~\ocwlowerid{options}$\ocweol
 \ocwindent{0.00em}
@@ -59033,7 +58935,7 @@ $\ocwlowerid{div\_end}$\ocweol
 \ocwindent{1.00em}
 $\ocwlowerid{ol}~$\^{}~\ocwkw{if}~$\ocwlowerid{permission}~=~\ocwupperid{Web\_corpus.Annotator}~$\ocwkw{then}~$\ocwlowerid{add\_sentence\_form}~$\ocwkw{else}~\ocwstring{""}\medskip
 
-\label{corpus_manager.ml:5281}%
+\label{corpus_manager.ml:5266}%
 \ocwindent{0.00em}
 ;\ocweol
 \ocwindent{0.00em}
@@ -59246,13 +59148,13 @@ $\ocwlowerid{value}~\ocwlowerid{main}~=$\ocweol
 \ocwindent{1.00em}
 \ocwkw{let}~$\ocwlowerid{env}~=~\ocwupperid{Cgi.}\ocwlowerid{create\_env}~(\ocwupperid{Cgi.}\ocwlowerid{query\_string}~())~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
-\ocwkw{let}~$\ocwlowerid{corpdir}~=~\ocwupperid{Cgi.}\ocwlowerid{decoded\_get}~\ocwupperid{Params.}\ocwlowerid{corpus\_dir}~$\ocwstring{""}~$\ocwlowerid{env}~$\ocwkw{in}\ocweol
+\ocwkw{let}~$\ocwlowerid{corpdir}~=~\ocwupperid{Cgi.}\ocwlowerid{decoded\_get}~\ocwupperid{Params.}\ocwlowerid{corpus\_dir}~$\ocwstring{""}~$\ocwlowerid{env}~$\ocweol
 \ocwindent{1.00em}
-\ocwkw{let}~$\ocwlowerid{permission}~=$\ocweol
-\ocwindent{2.00em}
-$\ocwupperid{Web\_corpus.}\ocwlowerid{permission\_of\_string}~(\ocwupperid{Cgi.}\ocwlowerid{decoded\_get}~\ocwupperid{Params.}\ocwlowerid{corpus\_permission}~$\ocwstring{""}~$\ocwlowerid{env})$\ocweol
+\ocwkw{and}~$\ocwlowerid{corpperm}~=~\ocwupperid{Cgi.}\ocwlowerid{decoded\_get}~\ocwupperid{Params.}\ocwlowerid{corpus\_permission}~$\ocwstring{""}~$\ocwlowerid{env}~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
-\ocwkw{in}\ocweol
+\ocwkw{let}~$\ocwlowerid{permission}~=~\ocwupperid{Web\_corpus.}\ocwlowerid{permission\_of\_string}~\ocwlowerid{corpperm}~$\ocwkw{in}\ocweol
+\ocwindent{1.00em}
+\ocwkw{let}~$\ocwlowerid{lang}~=~\ocwupperid{Html.}\ocwlowerid{default\_language}~$\ocwkw{in}\ocweol
 \ocwindent{1.00em}
 \ocwkw{try}\ocweol
 \ocwindent{2.00em}
@@ -59260,13 +59162,9 @@ $\ocwupperid{Corpus\_manager.}\ocwlowerid{mk\_page}~\ocwlowerid{corpdir}~\ocwlow
 \ocwindent{1.00em}
 \ocwkw{with}\ocweol
 \ocwindent{1.00em}
-$[~\ocwupperid{Sys\_error}~\ocwlowerid{msg}~\rightarrow{}~\ocwupperid{Web.}\ocwlowerid{abort}~\ocwupperid{Html.}\ocwlowerid{default\_language}~\ocwupperid{Control.}\ocwlowerid{sys\_err\_mess}~\ocwlowerid{msg}$\ocweol
+$[~\ocwupperid{Sys\_error}~\ocwlowerid{msg}~\rightarrow{}~\ocwupperid{Web.}\ocwlowerid{abort}~\ocwlowerid{lang}~\ocwupperid{Control.}\ocwlowerid{sys\_err\_mess}~\ocwlowerid{msg}$\ocweol
 \ocwindent{1.00em}
-$\mid{}~\ocwlowerid{\_}~\rightarrow{}$\ocweol
-\ocwindent{2.00em}
-$\ocwupperid{Web.}\ocwlowerid{abort}~\ocwupperid{Html.}\ocwlowerid{default\_language}~\ocwupperid{Control.}\ocwlowerid{fatal\_err\_mess}$\ocweol
-\ocwindent{3.00em}
-\ocwstring{"Unexpected\ocwvspace{}anomaly"}\ocweol
+$\mid{}~\ocwlowerid{\_}~\rightarrow{}~\ocwupperid{Web.}\ocwlowerid{abort}~\ocwlowerid{lang}~\ocwupperid{Control.}\ocwlowerid{fatal\_err\_mess}~$\ocwstring{"Unexpected\ocwvspace{}anomaly"}\ocweol
 \ocwindent{1.00em}
 $]$\ocweol
 \ocwindent{0.00em}
@@ -59659,9 +59557,13 @@ $]$\ocweol
 \ocwendcode{}\typeout{OcamlWeb file Mk_corpus.ml}
 \ocwmodule{Mk\_corpus}
 \label{mk_corpus.ml:0}%
-\label{mk_corpus.ml:619}%
+This is an unfinished attempt to fiter out citations from Heritage
+   and make a corpus document from it - unused at present 
+\ocweol
+\label{mk_corpus.ml:750}%
+\medskip
 \ocwbegincode{}\ocwindent{0.00em}
-$\ocwlowerid{value}~\ocwlowerid{abort}~\ocwlowerid{report\_error}~\ocwlowerid{status}~=$\ocweol
+$\ocwlowerid{value}~\ocwlowerid{abort}~\ocwlowerid{report\_error}~\ocwlowerid{status}~=~$\ocweol
 \ocwindent{1.00em}
 \ocwkw{do}\ocweol
 \ocwindent{1.00em}
diff --git a/DOC/docintro b/DOC/docintro
index 0cac2c8fbe354857a006e4c327e7eef933c1e9e3..5d94c70412eefb38e47bd30550b15c8eec938732 100644
--- a/DOC/docintro
+++ b/DOC/docintro
@@ -6,7 +6,7 @@
 {\Large (Sanskrit Library V#VERSION; Zen toolkit V3.1)}\\[15pt] 
 {\large #DATE}\\[15pt]
 {\large G\'erard Huet \& Pawan Goyal}\\[10pt]
-{\large Copyright \copyright ~2000-2017 Inria}\\[20pt]
+{\large Copyright \copyright ~2000-2018 Inria}\\[20pt]
 \end{center}
 
 % Macros
diff --git a/ML/COPYRIGHT b/ML/COPYRIGHT
index 77d33bff87cbc93fac5eee51fd9e45833e491fd2..99256c1de9a3d5aa21ed607bfd34763502c96f83 100644
--- a/ML/COPYRIGHT
+++ b/ML/COPYRIGHT
@@ -1,8 +1,8 @@
 (**************************************************************************)
 (*                                                                        *)
-(*                     The Sanskrit Heritage Platform                     *)
+(*              The Sanskrit Heritage Dictionary Generator                *)
 (*                                                                        *)
-(*                       Gérard Huet & Pawan Goyal                        *)
+(*                           Gérard Huet                                  *)
 (*                                                                        *)
 (* ©2018 Institut National de Recherche en Informatique et en Automatique *)
 (**************************************************************************)
diff --git a/ML/canon.ml b/ML/canon.ml
index 6f0e9cf37466efbaa3eab76a3b47e546f826b1a8..d659a57d6a8c92f679e951bf1683e30363edcfb5 100644
--- a/ML/canon.ml
+++ b/ML/canon.ml
@@ -26,7 +26,7 @@ value canon = fun
   | 12 -> "o"
   | 13 -> "au"
   | 14 -> ".m" (* anusvaara *)
-  | 15 -> "~~" (* anunaasika candrabindu *)
+  | 15 -> "~~" (* anun\=asika candrabindu *)
   | 16 -> ".h"
   | 17 -> "k"
   | 18 -> "kh"
@@ -381,7 +381,7 @@ value canon2 = fun
   | 49 -> "h"
   | 50 -> "_" (* hiatus *)
   | -1 -> "'"
-  | -2 -> "[-]" (* Inconsistent with previous versions *)
+  | -2 -> "[-]" 
   | -3 -> "A|a" (* sandhi of A and (a,A) - phantom phoneme *)
   | -4 -> "A|i" (* sandhi of A and (i,I) - phantom phoneme *) 
   | -5 -> "A|u" (* sandhi of A and (u,U) - phantom phoneme *)
@@ -396,9 +396,9 @@ value catenate2 c (s,b) =
   let protected = if b && b' then "_" ^ s else s in
   (canon2 c ^ protected , b')
 ;
-(* [decode2 : word -> string] *)
+(* decode2 : word -> string (debug for [Morpho_xml] *)
 value decode2 word = 
-  try let (s,_) = List.fold_right catenate2 word ("",False) in s
+  try let (s,_) = List.fold_right catenate2 word ("",False) in s  
   with [ Failure _ -> failwith ("decode2: " ^ robust_decode (Word.mirror word)) ]
 ;
 value canon_upper = fun
diff --git a/ML/interface.ml b/ML/interface.ml
index 128a39da53182edc69bd89f53a4cdd419dc107d1..190ad9be92c254c92cf4eec36ee2ed2447969af0 100644
--- a/ML/interface.ml
+++ b/ML/interface.ml
@@ -540,7 +540,7 @@ value graph_engine () = do
        allSol (deprecated Validate mode)
        corpus sentenceNumber linkNumber (Corpus mode)
        corpdir sentno corpmode (defined in Params) 
-       guess gender revised rev_off rev_ind (User-aid)     *)
+       guess gender revised [rev_off] [rev_ind] (User-aid) *)
     let url_encoded_input = get "text" env "" 
     and url_encoded_topic = get "topic" env "" (* topic carry-over *)
     and st = get "st" env "t" (* sentence parse default *)
diff --git a/ML/verbs.ml b/ML/verbs.ml
index 39cabd70522ca5d152cc1bb17beb37d4d1fe384c..850cbc67eef5dd647268b8cc525ec56f1e54893b 100644
--- a/ML/verbs.ml
+++ b/ML/verbs.ml
@@ -376,7 +376,7 @@ value stems root =
      | "spardh" -> sampra "sp.rdh"
      | "svap"   -> sampra "sup" (* \Pan{6,1,15} *) 
      (*  note "vac", "yaj" etc not concerned although having samprasaara.na *)
-     | _ -> let weak = weak_stem root rstem 
+     | _ -> let weak   = weak_stem root rstem 
             and strong = strong_stem root rstem in
             let long = lengthened weak in
             (weak,strong,long)
@@ -523,9 +523,9 @@ value redup3 entry rstem =
                 | _ -> rstem 
                 ] in 
       (strong rstem,wstem)
-      and glue = revaffix [rv; rc] in 
-        if entry="s.r" then (* ad-hoc nonsense *)
-             (revcode "sisar",revcode "sis.r",iiflag) (* to avoid si.sarti ?!? *)
+      and glue = revaffix [ rv; rc ] in 
+        if entry="s.r" then (*i ad-hoc nonsense to avoid si.sarti ? i*)
+             (revcode "sisar",revcode "sis.r",iiflag) 
         else (glue strong,glue weak,iiflag)
     ]
 ;
@@ -2397,7 +2397,7 @@ value intercalates root =
             | "vyadh" | "zak" | "zad" | "zap" | "zi.s" | "zudh" | "zu.s" 
             | "zli.s" | "sa~nj" | "sic" | "sidh#1" | "s.rp" | "skand" 
             | "sva~nj" | "svid#2" | "had" 
-                -> anit
+                -> anit 
             | _ -> set (* default all multisyllabic, gana 10, nominal verbs plus:
 [ "afg" | "a~nc" | "an#2" | "arh" | "av" | "az#1" | "az#2" | "as#2" | "aas#2"
 | "indh" | "inv" | "i.s#1" | "i.s#2" | "iik.s" | "iifkh" | "ii.d" | "iiz#1" 
@@ -2545,8 +2545,8 @@ value compute_ppp_stems entry rstem =
     | "tud#1" | "t.rd" | "t.rr" | "dagh" | "d.rr" | "dev" | "draa#1" | "draa#2"
     | "nud" | "pad#1" | "pi#2" | "p.rr" | "pyaa" | "bha~nj" | "bhid#1" | "bhuj#1"
     | "majj" | "man" | "mid" | "mlaa" | "ri" | "lii" | "luu#1" | "vij" | "vid#2"
-    | "zad" | "zuu" | "z.rr" | "sad#1" | "skand" | "syand" | "st.rr" | "styaa" 
-    | "had" | "svid#2" | "haa#2" (* but not "k.svi.d" "zrath" *)
+    | "vlii" | "zad" | "zuu" | "z.rr" | "sad#1" | "skand" | "syand" | "st.rr" 
+    | "styaa" | "had" | "svid#2" | "haa#2" (* but not "k.svi.d" "zrath" *)
       -> 
       (* except lag which is "nipaatana" \Pan{7,2,18} *)
       let ppna w = [ Na w ] in
@@ -3977,18 +3977,19 @@ value compute_aorist entry =
     | "dhaa#1" | "dhaa#2" | "paa#1" | "bhuu#1" | "muc#1" | "zaa" 
     | "saa#1" | "sthaa#1" | "has" | "haa#1" -> do
       { compute_root_aorista weak strong entry 
-      ; if entry = "k.r#1" || entry = "gam" || entry = "jan" 
-           then compute_root_aoristm weak entry (* rare *) 
-        else if entry = "sthaa#1" (* Whitney §834a. *)
-                then compute_root_aoristm (revstem "sthi") entry (* asthita *) 
-   (*i [else if entry = "dhaa#1" then compute_root_aoristm (revstem "dhii") entry] ? i*)
-        else ()
+      ; match entry with
+        [ "k.r#1" | "gam" | "jan" -> compute_root_aoristm weak entry (* rare *) 
+        | "sthaa#1" (* Whitney §834a. *) ->
+                    compute_root_aoristm (revstem "sthi") entry (* asthita *) 
+   (*i [| "dhaa#1" -> compute_root_aoristm (revstem "dhii") entry] ? i*)
+        | _ -> ()
+        ]
       ; let stem = if entry = "muc#1" then strong else match long with 
             [ [ 2 (* aa *) :: _ ] -> [ 42 (* y *) :: long ]
             | _ -> long
             ] in 
         compute_root_aoristp stem entry (* passive *)
-      (* for root aorist participles, see Whitney§840 and Burrow p178 *)
+      (* For root aorist participles, see Whitney§840 and Burrow p178 *)
       }
     | "prii" -> let st = revcode "priiyaa" in compute_root_aorista st st entry 
     | "svid#2" -> let st = revcode "svidyaa" in compute_root_aorista st st entry
@@ -4003,8 +4004,8 @@ value compute_aorist entry =
     | "rabh" -> compute_root_aoristp (revcode "rambh") entry 
     | "jaag.r" | "t.rr" | "pac" | "zru" | "stu" | "hu"
         -> compute_root_aoristp long entry 
-    (* "zru" -> azraayi Whitney§844a typo ? (azraayi WR) *) 
-    | _ -> () (* "i" -> iiyaat difficile *)
+           (* NB "zru" -> azraavi WR while Whitney§844a azraayi typo *) 
+    | _ -> () (* "i" -> iiyaat hard *)
     ]
   ; match entry with (* 2. thematic aorist af *)
     [ "aap" | "krudh" | "gam" | "g.rdh" | "ghas" | "das" | "dyut#1" | "muc#1" 
@@ -4012,7 +4013,7 @@ value compute_aorist entry =
     | "zuc#1" | "zudh" | "sic" | "stan" | "huu" 
      -> do
       { compute_thematic_aorista weak entry
-      ; compute_thematic_aoristm weak entry (* middle is very rare *)
+      ; compute_thematic_aoristm weak entry (* middle very rare *)
       }
     | "vyaa" -> let stem = revcode "vi" in do
       { compute_thematic_aorista stem entry
@@ -4038,8 +4039,8 @@ value compute_aorist entry =
       { compute_redup_aorista stem entry (* but atu.s.tavam RV (WR) *)  
       ; compute_redup_aoristm stem entry 
       }
-    | "iik.s" | "klid" | "gup" | "cur" | "m.r" | "d.rz#1" | "dyut#1" | "vrazc" 
-      -> (* active only *)
+    | "iik.s" | "kamp" | "klid" | "gup" | "cur" | "m.r" | "d.rz#1" | "dyut#1" 
+    | "vrazc" -> (* active only *)
       let stem = redup_aor weak entry in 
       compute_redup_aorista stem entry
     | "grah" -> do 
@@ -4047,8 +4048,7 @@ value compute_aorist entry =
         { compute_redup_aorista stem entry
         ; compute_redup_aoristm stem entry 
         }
-      ; let stem = redup_aor (revcode "grabh") entry in do
-        (* ved -- Whitney§223g *)
+      ; let stem = redup_aor (revcode "grabh") entry in do (* ved Whitney§223g *)
         { compute_redup_aorista stem entry
         ; compute_redup_aoristm stem entry 
         }
@@ -4058,7 +4058,7 @@ value compute_aorist entry =
         ; compute_redup_aoristm stem entry 
         }
       (* then exceptions to treatment of aa with intercalaring ii *)
-    | "raadh" -> let stem = redup_aor (revcode "radh") entry in (* riiradh *) 
+    | "raadh" -> let stem = redup_aor (revcode "radh") (* riiradh *) entry in  
                  compute_redup_aorista stem entry (* Macdonnel p 126 *)
     | "haa#1" -> let stem = revcode "jiijah" in 
                  compute_redup_aorista stem entry
@@ -4074,12 +4074,12 @@ value compute_aorist entry =
     | "nii#1" | "pac" | "praz" | "prii" | "budh#1" | "bhaa#1" | "bhii#1" 
     | "muc#1" | "yaj#1" | "yuj#1" | "ram" | "labh" | "v.r#2" | "vyadh" | "zru" 
     | "s.rj#1" | "stu" | "sp.rz#1" | "hu" -> do
-      { let stema = match entry with
+      { let stem = match entry with
             [ "d.rz#1" | "s.rj#1" | "sp.rz#1" -> long_metathesis weak
             | "ram" -> weak 
             | _ -> long
             ] in
-        compute_ath_s_aorista stema entry 
+        compute_ath_s_aorista stem entry 
       ; if entry = "yuj#1" || entry = "chid#1" 
            then compute_ath_s_aorista strong entry else ()
         (* ayok.siit and acchetsiit besides ayauk.siit and acchaitsiit *)
@@ -4132,7 +4132,7 @@ value compute_aorist entry =
       compute_ath_is_aorista (revcode "zve") entry 
     | "kan" | "k.r#2"| "p.rr" -> (* active only *)
       compute_ath_is_aorista long entry 
-    | "jan" | "zii#1" | "spand" -> (* middle only *)
+    | "kamp" | "jan" | "zii#1" | "spand" -> (* middle only *)
       compute_ath_is_aoristm strong entry 
     | "grah" -> do 
       { let stem = revcode "grah" in do (* same as group above *)
@@ -4336,6 +4336,7 @@ value perif conj perstem entry = do
              | "p.rr"   -> revcode "puuri" (* puuritum *)
              | "sva~nj" -> revcode "svaj" (* svaktum *)
              | "sa~nj"  -> revcode "saj" (* saktum *)
+             | ".dii"   -> revcode ".dii" (* .diitum *)
              | _ -> perstem
              ] 
         | _ -> perstem 
@@ -5276,13 +5277,14 @@ value den_stem_a entry = (* in general transitive Whitney§1059c *)
    | "kar.na" | "kalafka" | "kalu.sa" | "kavala" | "ku.t.ta" | "kusuma" 
    | "kha.da" | "garva" | "gopaa" | "carca" | "cuur.na" | "chala" | "chidra"
    | "tantra" | "tarafga" | "taru.na" | "tuhina" | "da.n.da" | "deva" | "dola"
-   | "dhiira#1" | "nuutana" | "pa.tapa.taa" | "pallava" | "pavitra" | "paaza" 
-   | "pi.n.da" | "pulaka" | "puula" | "pratikuula" | "prati.sedha" 
-   | "pradak.si.na" | "prasaada" | "bhi.saj" | "mantra" | "malina" | "mizra"
-   | "mukula" | "mukhara" | "mu.n.da" | "muutra" | "m.rga" | "yantra" | "rasa" 
-   | "ruuk.sa" | "lagha" (* u -> a *) | "var.na" | "vaasa#3" | "vizada"
-   | "vra.na" | "zaanta" | "zithila" | "zyena" | ".sa.n.dha" | "sapi.n.da" 
-   | "saphala" | "sabhaaja" | "saantva" | "saavadhaana" | "suutra" | "stena" 
+   | "dravat" | "dhiira#1" | "nuutana" | "pa.tapa.taa" | "pallava"
+   | "pavitra" | "paaza" | "pi.n.da" | "pulaka" | "puula" | "pratikuula" 
+   | "prati.sedha" | "pradak.si.na" | "prasaada" | "bhi.saj" | "mantra" 
+   | "malina" | "mizra" | "mukula" | "mukhara" | "mu.n.da" | "muutra" 
+   | "m.rga" | "yantra" | "rasa" | "ruuk.sa" | "lagha" (* u -> a *) 
+   | "var.na" | "vaasa#3" | "vizada" | "vra.na" | "zaanta" | "zithila"
+   | "zyena" | ".sa.n.dha" | "sapi.n.da" | "saphala" | "sabhaaja" | "saantva" 
+   | "saavadhaana" | "suutra" | "stena" 
    | "sthaga" | "tapas" (* practice \Pan{3,1,15} *)
    | "u.sas" | "namas" | "varivas" (* do \Pan{3,1,19} *)
    | "udan" (* Kale§645 *)
diff --git a/ML/version.ml b/ML/version.ml
index 99da082e76e6cd0020f93a93bf391d1496805d18..e1bc0ea7c72b7a6762807b4c5d91a82a90ff2e0a 100644
--- a/ML/version.ml
+++ b/ML/version.ml
@@ -1,11 +1,11 @@
 (**************************************************************************)
 (*                                                                        *)
-(*                     The Sanskrit Heritage Platform                     *)
+(*              The Sanskrit Heritage Dictionary Generator                *)
 (*                                                                        *)
-(*                       Gérard Huet & Pawan Goyal                        *)
+(*                           Gérard Huet                                  *)
 (*                                                                        *)
 (* ©2018 Institut National de Recherche en Informatique et en Automatique *)
 (**************************************************************************)
 
 (* Generated by make version - see main Makefile *)
-value version="3.05" and version_date="2018-03-15";
+value version="3.05" and version_date="2018-04-01";
diff --git a/SETUP/version.txt b/SETUP/version.txt
index d35854ce76da7701113c9cd582acdf6e042d9118..53f7fce5593678b3db5de36c5df4df00ed191cdb 100644
--- a/SETUP/version.txt
+++ b/SETUP/version.txt
@@ -1,2 +1,2 @@
 VERSION='3.05'
-DATE='2018-03-15'
+DATE='2018-04-01'