diff --git a/ML/conjugation.ml b/ML/conjugation.ml
index 7927272ce14d00e46feabce9d436fce91fde30a0..e8aacd79a861655fd2b628e53b4870dd55410121 100644
--- a/ML/conjugation.ml
+++ b/ML/conjugation.ml
@@ -18,11 +18,11 @@
 (*i executable module Conjugation = struct i*)
 
 open Skt_morph;
-open Morphology; (* inflected [Verb_form] etc. *)
+open Morphology; (* [inflected Verb_form] etc. *)
 open Conj_infos; (* [vmorph Causa Inten Desid root_infos] *)
-open Inflected; (* roots.val indecls.val etc. *)
+open Inflected; (* [roots.val indecls.val] etc. *)
 open Html;
-open Web; (* ps pl font Deva Roma pr_font etc. *)
+open Web; (* [ps pl font Deva Roma pr_font] etc. *)
 open Cgi;
 open Multilingual; (* [gentense tense_name captions] *)
 
@@ -843,7 +843,8 @@ value conjs_engine () = do
    try
     let url_encoded_entry = List.assoc "q" env
     and url_encoded_class = List.assoc "c" env 
-    and font = font_of_string (get "font" env Paths.default_display_font)
+    and font = let s = get "font" env Paths.default_display_font in
+               font_of_string s (* deva vs roma print *)
     (* OBS and stamp = get "v" env "" *)
     and translit = get "t" env "VH" (* DICO created in VH trans *)
     and lex = get "lex" env "SH" (* default Heritage *) in 
@@ -872,7 +873,7 @@ value conjs_engine () = do
         let entry = resolve_homonym entry_VH gana in (* VH string with homo *)
         let known = in_lexicon entry (* in lexicon? *) 
           (* we should check it is indeed a root or denominative *) in do 
-        { let link = if known then Morpho_html.skt_anchor False font entry 
+        { let link = if known then Morpho_html.skt_anchor False entry 
                      else doubt (Morpho_html.skt_roma entry) in 
           let subtitle = hyperlink_title font link in
           display_subtitle (h1_center subtitle)
diff --git a/ML/declension.ml b/ML/declension.ml
index 0f76b197ca547f2b1d0ce7ed18954ca9c71af1d9..43af5cbeb6a0767980afb6122901bfaf0c403861 100644
--- a/ML/declension.ml
+++ b/ML/declension.ml
@@ -19,8 +19,8 @@
 open Skt_morph;
 open Morphology; (* [Noun_form] etc. *)
 open Html; (* [narrow_screen html_red]  etc. *)
-open Web; (* ps pl font Deva Roma pr_font etc. *)
-open Cgi; (* [create_env] etc.  *)
+open Web;  (* [ps pl font Deva Roma pr_font] etc. *)
+open Cgi;  (* [create_env] etc. *)
 open Multilingual; (* [declension_title compound_name avyaya_name] *)
 
 value dtitle font = h1_title (declension_title narrow_screen font)
@@ -46,7 +46,7 @@ value display_subtitle title = do
   ; title |> ps
   ; th_end |> ps 
   ; tr_end |> ps 
-  ; table_end |> pl (* Centered *)
+  ; table_end |> pl (* centered *)
   ; html_paragraph |> pl
   }
 ;
@@ -132,19 +132,19 @@ value display_iic font = fun
   | l -> do 
     { html_paragraph |> pl
     ; h3_begin C3 |> ps
-    ; compound_name font |> ps; ps " "
+    ; compound_name font |> ps; " " |> ps
     ; let print_iic w = pr_i font w in
       List.iter print_iic l
     ; h3_end |> ps
     }
   ]
 ;
-value display_avy font = fun
+value display_avya font = fun
   [ [] -> ()
   | l -> do 
     { html_paragraph |> pl
     ; h3_begin C3 |> ps
-    ; avyaya_name font |> ps; ps " "
+    ; avyaya_name font |> ps; " " |> ps
     ; let ifc_form w = [ 0 ] (* - *) @ w in
       let print_iic w = pr_font font (ifc_form w) in
       List.iter print_iic l
@@ -154,16 +154,16 @@ value display_avy font = fun
 ;
 value sort_out accu form = fun
      [ [ (_,morphs) ] -> List.fold_left (reorg form) accu morphs
-      where reorg f (mas,fem,neu,any,iic,avy) = fun
+      where reorg f (mas,fem,neu,any,iic,avya) = fun
         [ Noun_form g n c -> let t = (n,c,f) in 
             match g with 
-              [ Mas -> ([ t :: mas ],fem,neu,any,iic,avy)
-              | Fem -> (mas,[ t :: fem ],neu,any,iic,avy)
-              | Neu -> (mas,fem,[ t :: neu ],any,iic,avy)
-              | Deictic _ -> (mas,fem,neu,[ t :: any ],iic,avy)
+              [ Mas -> ([ t :: mas ],fem,neu,any,iic,avya)
+              | Fem -> (mas,[ t :: fem ],neu,any,iic,avya)
+              | Neu -> (mas,fem,[ t :: neu ],any,iic,avya)
+              | Deictic _ -> (mas,fem,neu,[ t :: any ],iic,avya)
               ]
-        | Bare_stem | Gati -> (mas,fem,neu,any,[ f :: iic ],avy)
-        | Avyayaf_form -> (mas,fem,neu,any,iic,[ f :: avy ])
+        | Bare_stem | Gati -> (mas,fem,neu,any,[ f :: iic ],avya)
+        | Avyayaf_form -> (mas,fem,neu,any,iic,[ f :: avya ])
         | Ind_form _ | Verb_form _ _ _  | Ind_verb _ | Abs_root _ 
         | Avyayai_form | Unanalysed | PV _ 
         | Part_form _ _ _ _ ->
@@ -173,19 +173,19 @@ value sort_out accu form = fun
      ]
 and init = ([],[],[],[],[],[])
 ;
-value display_inflected font (gen_deco,pn_deco,voca_deco,iic_deco,avy_deco) = 
+value display_inflected font (gen_deco,pn_deco,voca_deco,iic_deco,avya_deco) = 
   let nouns = Deco.fold sort_out init gen_deco in 
   let non_vocas = Deco.fold sort_out nouns pn_deco in 
   let (mas,fem,neu,any,_,_) = Deco.fold sort_out non_vocas voca_deco 
   and iic = List.map fst (Deco.contents iic_deco) 
-  and avy = List.map fst (Deco.contents avy_deco) in do
+  and avya = List.map fst (Deco.contents avya_deco) in do
   { center_begin |> pl
   ; display_gender font Mas mas 
   ; display_gender font Fem fem 
   ; display_gender font Neu neu
   ; display_gender font (Deictic Numeral) any (* arbitrary *)
   ; display_iic font iic 
-  ; display_avy font avy 
+  ; display_avya font avya 
   ; center_end |> pl 
   ; html_paragraph |> pl
   }
@@ -241,7 +241,8 @@ value decls_engine () = do
     and url_encoded_participle = get "p" env ""
     and url_encoded_source = get "r" env ""
         (* optional root origin - used by participles in conjugation tables *)
-    and font = font_of_string (get "font" env Paths.default_display_font)
+    and font = let s = get "font" env Paths.default_display_font in
+               font_of_string s (* deva vs roma print *)
     and translit = get "t" env "VH" (* DICO created in VH trans *)
     and lex = get "lex" env "SH" (* default Heritage *) in 
     let entry_tr = decode_url url_encoded_entry (* : string in translit *)
@@ -257,14 +258,17 @@ value decls_engine () = do
                        (* will be avoided by unique name lookup *) 
         let entry = resolve_homonym entry_VH in (* compute homonymy index *)
         let link =
-          if in_lexicon entry then Morpho_html.skt_anchor False font entry
+          if in_lexicon entry then Morpho_html.skt_anchor False entry
              (* We should check it is indeed a substantive entry 
                 and that Any is used for deictics/numbers (TODO) *)
-          else let root = if source = "" then "?" (* unknown in lexicon *)
-                          else " from " ^ 
-               if in_lexicon source then Morpho_html.skt_anchor False font source
-               else doubt (Morpho_html.skt_roma source) in
-               Morpho_html.skt_roma entry ^ root in
+             (* Also it should use unique naming for possible homo index *)
+          else Morpho_html.skt_html_font font entry |> italics in
+(* OBSOLETE indication of root for kridanta
+        [let root = if source = "" then "?" (* unknown in lexicon *)
+                    else " from " ^ (* should test font *) in
+         if in_lexicon source then Morpho_html.skt_anchor False font source
+         else doubt (Morpho_html.skt_roma source) in (* should test font *)
+               Morpho_html.skt_utf font entry ^ root in] *)
         let subtitle = hyperlink_title font link in do
         { display_subtitle (h1_center subtitle)
         ; try look_up font entry (Nouns.Gender gender) part
@@ -273,7 +277,7 @@ value decls_engine () = do
       ; page_end lang True
       }
     with [ Stream.Error _ -> 
-             abort lang ("Illegal " ^ translit ^ " transliteration ") entry_tr ]
+           abort lang ("Illegal " ^ translit ^ " input ") entry_tr ]
   }
 ;
 value safe_engine () =
diff --git a/ML/encode.ml b/ML/encode.ml
index cea9b007809d7abd0f97d2b078c2b68234f8cc34..5e1f8b3157646bc0117192a9f75259aa9acd17e1 100644
--- a/ML/encode.ml
+++ b/ML/encode.ml
@@ -4,7 +4,7 @@
 (*                                                                        *)
 (*                              Gérard Huet                               *)
 (*                                                                        *)
-(* ©2019 Institut National de Recherche en Informatique et en Automatique *)
+(* ©2020 Institut National de Recherche en Informatique et en Automatique *)
 (**************************************************************************)
 
 (*i module Encode = struct i*)
@@ -18,7 +18,7 @@ exception In_error of string (* Error in user or corpus input *)
 value is_vowel c = vowel c || c>100 && c<114 (* accounts for upper case *)
 ;
 (* anusvara substituted by nasal or normalized to 14 when original *)
-(* anunaasika before vowels treated as anusvaara *)
+(* anunaasika after vowels treated as anusvaara *)
 value rec normalize = normal_rec False
   where rec normal_rec after_vow = fun
   [ [] -> []
@@ -50,8 +50,8 @@ value code_string    str = normalize (code_raw str) (* standard VH *)
 and   code_string_WX str = normalize (code_raw_WX str)
 and   code_string_KH str = normalize (code_raw_KH str) 
 and   code_string_SL str = normalize (code_raw_SL str)
-and   code_skt_ref   str = normalize (code_rawu str)
-and   code_skt_ref_d str = normalize (code_rawd str)
+and   code_skt_ref   str = normalize (code_rawu str) (* with upper letters *)
+and   code_skt_ref_d str = normalize (code_rawd str) (* no diacritics *)
 ;
 (* Switching code function according to transliteration convention *)
 value switch_code = fun (* normalizes anusvaara in its input *)
@@ -113,11 +113,11 @@ value code_strip_raw s =  rev_strip (code_raw s)
 (* A cleaner solution would be to have type lexeme = (word * int) 
    and "x#5" represented as (x,5) (0 if no homophone) *)
 ;
-value skt_to_deva         str = try Canon.unidevcode (code_string str) with
+value skt_to_deva     str = try Canon.unidevcode (code_string str) with
                                 [ Failure _ -> raise (In_error str) ]
-and skt_raw_to_deva       str = try Canon.unidevcode (code_raw str) with
+and skt_raw_to_deva   str = try Canon.unidevcode (code_raw str) with
                                 [ Failure _ -> raise (In_error str) ]
-and skt_raw_strip_to_deva str = try Canon.unidevcode (code_strip_raw str) with
+and skt_strip_to_deva str = try Canon.unidevcode (code_strip_raw str) with
                                 [ Failure _ -> raise (In_error str) ]
 ;
 (* Following not needed since [Transduction.skt_to_html] is more direct 
diff --git a/ML/html.ml b/ML/html.ml
index 8dcc37c592a12e651ad1b45c7af07855b07b49da..01080f89a2cd16bc3ccb98f32ee9fa6d4cb2e0a5 100644
--- a/ML/html.ml
+++ b/ML/html.ml
@@ -220,7 +220,7 @@ value rgb = fun (* a few selected HTML colors in rgb data *)
   | Blue        -> "#0000FF" (* Canard = "#0000C0" ou "#0080FF" *)
   | Green       -> "#008000" (* Teal = "#008080" Olive = "#808000" *)
   | Aquamarine  -> "#6FFFC3" (* actually Light Aquamarine *)
-  | Lawngreen   -> "#7CFC00" 
+  | Lawngreen   -> "#66ff99" (* was "#7CFC00" *)
   | Yellow      -> "#FFFF00" 
   | Orange      -> "#FFA000"  
   | Cyan        -> "#00FFFF" (* Aqua = Cyan, Turquoise = "#40E0D0" *)
diff --git a/ML/indexer.ml b/ML/indexer.ml
index a0c30aeb0b0c68fc5cc4e9762940322f4503283b..fbcf1adf89e499944b096efa13dd13830d00d38e 100644
--- a/ML/indexer.ml
+++ b/ML/indexer.ml
@@ -32,8 +32,8 @@ value answer_end () = do
   ; pl html_paragraph
   }
 ;
-value ok (mess,s) = do { ps mess; pl (Morpho_html.skt_anchor_R False s) }
- and ok2 (mess,s1,s2) = do { ps mess; pl (Morpho_html.skt_anchor_R2 s1 s2) }
+value ok (mess,s) = do { ps mess; pl (Morpho_html.skt_anchor False s) }
+ and ok2 (mess,s1,s2) = do { ps mess; pl (Morpho_html.skt_anchor_R s1 s2) }
      (* 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. *)
@@ -59,7 +59,7 @@ and report_failure s = do
   { ps " not found in dictionary"
   ; pl html_break
   ; ps "Closest entry in lexical order: " 
-  ; ps (Morpho_html.skt_anchor_R False s)
+  ; ps (Morpho_html.skt_anchor False s)
   ; pl html_break
   }
 ;
@@ -101,6 +101,8 @@ value print_word word (entry,lex,page) = match lex with
 value read_mw_index () = 
   (Gen.gobble Data.public_mw_index_file : Deco.deco (string * string * string)) 
 ;
+value skt_red s = html_red (Morpho_html.skt_roma s)
+;
 value index_engine () = do
   { pl http_header
   ; page_begin heritage_dictionary_title
@@ -124,7 +126,7 @@ value index_engine () = do
             let mw_index = read_mw_index () in 
             let words = Deco.assoc word mw_index in
             match words with
-              [ [] -> do { ps (Morpho_html.skt_red str_VH)
+              [ [] -> do { ps (skt_red str_VH)
                          ; ps " not found in MW dictionary"
                          ; pl html_break
                          }
@@ -143,7 +145,7 @@ value index_engine () = do
                     (* even though str may exist as inflected form  *)
               with (* Matching entry not found - we try declensions *)
                   [ Index.Last last -> do
-                      { ps (Morpho_html.skt_red str_VH)
+                      { ps (skt_red str_VH)
                       ; try_declensions word last
                       }
                   ]
diff --git a/ML/indexerd.ml b/ML/indexerd.ml
index 0b1dc897696a605e8344e3bb5111729cdaa3f90b..cfa47f13a413f381c4998b7c7f5f07660e0f0624 100644
--- a/ML/indexerd.ml
+++ b/ML/indexerd.ml
@@ -4,7 +4,7 @@
 (*                                                                        *)
 (*                              Gérard Huet                               *)
 (*                                                                        *)
-(* ©2019 Institut National de Recherche en Informatique et en Automatique *)
+(* ©2020 Institut National de Recherche en Informatique et en Automatique *)
 (**************************************************************************)
 
 (* CGI-bin indexerd for indexing in sanskrit dico without diacritics.     *)
@@ -47,13 +47,15 @@ value postlude () = do
   ; page_end Html.French True 
   }
 ;
-value print_word c = pl (Morpho_html.skt_anchor_R False (Canon.decode_ref c))
+value print_word c = pl (Morpho_html.skt_anchor False (Canon.decode_ref c))
 ;
 (* Each dummy is mapped to a list of words - all the words which
    give back the dummy by normalisation such as removing diacritics *)
 value read_dummies () =
   (Gen.gobble Data.public_dummies_file : Deco.deco Word.word)
 ;
+value skt_red s = html_red (Morpho_html.skt_roma s)
+;
 value index_engine () = 
   let abor = abort Html.French (* may not preserve the current lang *) in
   try let dummies_deco = read_dummies () in do
@@ -69,7 +71,7 @@ value index_engine () =
            ; ps (div_begin Latin12)
            ; let words = Deco.assoc dummy dummies_deco in
              match words with
-               [ [] -> do { ps (Morpho_html.skt_red str)
+               [ [] -> do { ps (skt_red str)
                           ; ps " not found in Heritage dictionary"
                           ; ps html_break; pl html_break
                           }
diff --git a/ML/interface.ml b/ML/interface.ml
index 57c7f467bfe386f9f6478d17a6180c40343f2bf8..9fc8821964489dc5013a3fb3aff98d73c427c297 100644
--- a/ML/interface.ml
+++ b/ML/interface.ml
@@ -518,9 +518,10 @@ value graph_engine () = do
     and us = get "us" env "f" (* sandhied text default *)
     and translit = get "t" env Paths.default_transliteration (* translit input *)
     and lex = get "lex" env Paths.default_lexicon (* lexicon choice *)
-    and font = get "font" env Paths.default_display_font (* deva vs roma print *)
+    and font = get "font" env Paths.default_display_font in 
+    let ft = font_of_string font (* Deva vs Roma print *)
     and cache = get "cache" env "f" (* no cache default *) in
-    let () = sanskrit_display.val := font 
+    let () = sanskrit_font.val := ft 
     and () = cache_active.val := cache 
     and abs = get "abs" env "f" (* default local paths *) in 
     let lang = language_of lex (* language default *)
@@ -537,13 +538,13 @@ value graph_engine () = do
     and link_num = get "linkNumber" env "0" (* is there a better default? *)
     and sol_num = get "allSol" env "0" in (* Needed for Validate mode *)
     let url_enc_corpus_permission = (* Corpus mode *)
-        get Params.corpus_permission env "true" in
+        get Params.corpus_permission env "true" in 
     let corpus_permission = 
       url_enc_corpus_permission
       |> decode_url
       |> Web_corpus.permission_of_string in
-    let corpus_dir = get Params.corpus_dir env "" in
-    let sentence_no = get Params.sentence_no env "" in
+    let corpus_dir = get Params.corpus_dir env "" 
+    and sentence_no = get Params.sentence_no env "" in
     let text = arguments translit lex font cache st us cp url_encoded_input
                          url_encoded_topic abs sol_num corpus sent_id link_num
                          url_enc_corpus_permission corpus_dir sentence_no
@@ -568,7 +569,7 @@ value graph_engine () = do
     let revised = decode_url (get "revised" env "") (* User-aid revision *)
     and rev_off = int_of_string (get "rev_off" env "-1") 
     and rev_ind = int_of_string (get "rev_ind" env "-1") in 
-   try do
+   try do 
    { match (revised,rev_off,rev_ind) with
      [ ("",-1,-1) -> (* Standard input processing *** Main call *** *)
        check_sentence translit uns text checkpoints input sol_num
@@ -624,7 +625,7 @@ value graph_engine () = do
      else ()
    ; close_page_with_margin ()
    ; page_end lang True
-   }
+   } 
    with 
  [ Sys_error s         -> abort lang Control.sys_err_mess s (* file pb *)
  | Stream.Error s      -> abort lang Control.stream_err_mess s (* file pb *)
diff --git a/ML/make_xml_data.ml b/ML/make_xml_data.ml
index f291f9684036e830ae838486f8d2f80e8bebc231..c9c6641fd3e2717c772a8f0a5fa29a85ae280980 100644
--- a/ML/make_xml_data.ml
+++ b/ML/make_xml_data.ml
@@ -327,7 +327,7 @@ value print_inverse_map_xml trans form (delta,morphs) =
   }
 ;
 (* Outputs an XML stream on stdout *)
-value print_header trans = do
+value print_xml_header trans = do
   { "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" |> pl
   ; "<!DOCTYPE forms SYSTEM \"" ^ trans ^ "_morph.dtd\">" |> pl
   ; "<!-- Header" |> pl
@@ -339,7 +339,7 @@ value print_header trans = do
   }
 ;
 value print_xml trans inflected_map = do
-  { print_header trans
+  { print_xml_header trans
   ; "<forms>" |> pl
   ; Deco.iter (print_inverse_map_xml trans) inflected_map
   ; "</forms>" |> pl
@@ -352,7 +352,7 @@ value print_xml_word trans (w,_) = do
   }
 ;
 value print_xml_list trans banks prevs = do
-  { print_header trans
+  { print_xml_header trans
   ; "<forms>" |> pl
   ; let print_bank inflected_map = 
         Deco.iter (print_inverse_map_xml trans) inflected_map in
diff --git a/ML/mk_reader_page.ml b/ML/mk_reader_page.ml
index f4e5bfce9473418f51e11f6065543004ec33328c..d96ca9208cc0359addf2e90c6dfbc9e18b90e1c4 100644
--- a/ML/mk_reader_page.ml
+++ b/ML/mk_reader_page.ml
@@ -62,7 +62,7 @@ value reader_page () = do
     and url_encoded_mode  = get "mode" env "g"
     and url_encoded_topic = get "topic" env ""
     and st = get "st" env "t" (* default vaakya rather than isolated pada *)
-(*  and cp = get "cp" env default_mode TODO: dead code *)
+(* [and cp = get "cp" env default_mode TODO: dead code ] *)
     and us = get "us" env "f" (* default input sandhied *)
     and cache_active = get "cache" env cache_active.val
     and translit = get "t" env Paths.default_transliteration 
@@ -76,7 +76,7 @@ value reader_page () = do
     let corpus_dir = Cgi.decoded_get Params.corpus_dir "" env in
     let sentence_no = Cgi.decoded_get Params.sentence_no "" env in do
 
-  { pl (body_begin back_ground) 
+  { body_begin back_ground |> pl 
   ; print_title (Some lang) reader_title
   ; h3_begin C3 |> pl
   ; if Web_corpus.(permission_of_string corpus_permission = Annotator) then
@@ -98,12 +98,12 @@ value reader_page () = do
         [ (" Unsandhied ","t",us="t") 
         ; ("  Sandhied  ","f",us="f") 
         ] |> pl
-(* Mode Simple deprecated 
-  ; pl " Parser strength "
+(* option Simple deprecated TODO
+ [; pl " Parser strength "
   ; pl (option_select_default "cp"
         [ ("  Full  ","t",cp="t") 
         ; (" Simple ","f",cp="f")
-        ]) *)
+        ])] *)
 (* Sanskrit printer deva/roma *)
   ; " Sanskrit display font" |> pl
   ; sanskrit_font_switch_default font "font" |> ps
diff --git a/ML/morpho.ml b/ML/morpho.ml
index c9f943b04b35187d431de2b79ab3e7f5a806bea2..fb6def4f118696f9a8c24aeb6e90a4e05fea1aae 100644
--- a/ML/morpho.ml
+++ b/ML/morpho.ml
@@ -21,9 +21,9 @@ module Morpho_out (Chan: sig value chan: ref out_channel; end)
 
 value ps s = output_string Chan.chan.val s 
 ; 
-value pl s = ps (s ^ "\n")
+value pl s = s ^ "\n" |> ps
 ;
-value pr_word w = ps (Canon.decode w)
+value pr_word w = Canon.decode w |> ps
 ;
 value print_morph m = string_morph m |> ps
 and print_verbal vb = string_verbal vb |> ps
@@ -46,13 +46,13 @@ value rec select_morphs (seg_num,sub) seg_count = fun
   | [ last :: [] ] -> select_morph (seg_num,sub,seg_count) last 
   | [ first :: rest ] -> do
       { select_morph (seg_num,sub,seg_count) first
-      ; ps " | "
+      ; " | " |> ps
       ; select_morphs (seg_num,sub) (seg_count+1) rest
       }
   ]
 ;
 value print_morphs (seg_num,sub) morphs = match seg_num with
-  [ 0 -> let bar () = ps " | " in
+  [ 0 -> let bar () = " | " |> ps in
          List2.process_list_sep print_morph bar morphs
   | _ -> select_morphs (seg_num,sub) 1 morphs
   ]
@@ -65,29 +65,29 @@ value print_morphs (seg_num,sub) morphs = match seg_num with
    [pu : word -> unit] prints un-analysed chunks. *)
 value print_inv_morpho pe pne pu form (seg_num,sub) generative (delta,morphs) = 
   let stem = Word.patch delta form in do (* stem may have homo index *)
-    { ps "[" 
+    { "[" |> ps 
     ; if generative then (* interpret stem as unique name *)
         let (homo,bare_stem) = homo_undo stem in
         let krit_infos = Deco.assoc bare_stem unique_kridantas in 
         try let (verbal,root) = look_up_homo homo krit_infos in do
         { match Deco.assoc bare_stem lexical_kridantas with
           [ [] (* not in lexicon *) -> 
-              if stem = [ 3; 32; 1 ] (* ita ifc *) then pe stem
-                                                   else pne bare_stem
+              if stem = [ 3; 32; 1 ] (* ita ifc *) then stem |> pe
+                                                   else bare_stem |> pne
           | entries (* bare stem is lexicalized *) ->
               if List.exists (fun (_,h) -> h=homo) entries
-                 then pe stem (* stem with exact homo is lexical entry *)
-              else pne bare_stem
+                 then stem |> pe (* stem with exact homo is lexical entry *)
+              else bare_stem |> pne
           ] 
-        ; ps " { "; print_verbal verbal; ps " }["; pe root; ps "]"
-        } with [ _ -> pu bare_stem ]
+        ; " { " |> ps; print_verbal verbal; " }[" |> ps; root |> pe; "]" |> ps
+        } with [ _ -> bare_stem |> pu ]
       else match morphs with
-	   [ [ Unanalysed ] -> pu stem 
-	   | _ -> pe stem 
+	   [ [ Unanalysed ] -> stem |> pu 
+	   | _ -> stem |> pe
 	   ]
-    ; ps "]{"
+    ; "]{" |> ps
     ; print_morphs (seg_num,sub) morphs
-    ; ps "}"
+    ; "}" |> ps
     }
 ;
 (* Decomposes a preverb sequence into the list of its components *)
@@ -99,12 +99,10 @@ value print_inv_morpho_link pvs pe pne pu form =
   let pv = if Phonetics.phantomatic form then [ 2 ] (* aa- *)(*i OBSOLETE i*)
            else pvs in
   let encaps print e = (* encapsulates prefixing with possible preverbs *)
-     if pv = [] then print e else 
-        let pr_pv pv = do { pe pv; ps "-" } in do 
-            { List.iter pr_pv (decomp_pvs pvs)
-            ; print e 
-            } in
-        print_inv_morpho (encaps pe) (encaps pne) pu form
+     if pv = [] then print e 
+     else let pr_pv pv = do { pv |> pe; "-" |> ps } in do 
+              { List.iter pr_pv (decomp_pvs pvs); print e } in
+          print_inv_morpho (encaps pe) (encaps pne) pu form
 (* Possible overgeneration when derivative of a root non attested with pv 
    since only existential test in [Dispatcher.validate_pv]. Thus
    [anusandhiiyate] should show [dhaa#1], not [dhaa#2], [dhii#1] or [dhyaa] *)
@@ -113,21 +111,21 @@ value print_inv_morpho_link pvs pe pne pu form =
 (* Used in [Lexer.record_tagging] for regression analysis *)
 value report_morph gen form (delta,morphs) =
   let stem = Word.patch delta form in do (* stem may have homo index *)
-    { ps "{ "
+    { "{ " |> ps
     ; print_morphs (0,0) morphs 
-    ; ps " }[" 
+    ; " }[" |> ps 
     ; if gen then (* interpret stem as unique name *)
-        let (homo,bare_stem) = homo_undo stem in
-        let krid_infos = Deco.assoc bare_stem unique_kridantas in 
+        let (homo,bare) = homo_undo stem in
+        let krid_infos = Deco.assoc bare unique_kridantas in 
         let (vb,root) = look_up_homo homo krid_infos in do
         { match Deco.assoc stem lexical_kridantas with
-          [ [] (* not in lexicon *)        -> do { ps "G:"; pr_word bare_stem }
-          | _  (* stem is lexical entry *) -> do { ps "L:"; pr_word stem }
+          [ [] (* not in lexicon *)      -> do { "G:" |> ps; pr_word bare }
+          | _  (* stem is lexicalized *) -> do { "L:" |> ps; pr_word stem }
           ]
-        ; ps " { "; print_verbal vb; ps " }["; pr_word root; ps "]"
+        ; " { " |> ps; print_verbal vb; " }[" |> ps; pr_word root; "]" |> ps
         }
       else pr_word stem
-    ; ps "]"
+    ; "]" |> ps
     } 
 ;
 
diff --git a/ML/morpho_html.ml b/ML/morpho_html.ml
index 98e4c608b8154d0dfb39f1ddba00ba469a1857bc..38e6b27297dd5c64695b2cefed79c3fc9891ea4f 100644
--- a/ML/morpho_html.ml
+++ b/ML/morpho_html.ml
@@ -37,24 +37,39 @@ value url_cache s =
   mw_dico_url ^ mw_defining_page s ^ "#" ^ Encode.anchor s
 ;
 (* Romanisation of Sanskrit *)
-value skt_roma s = italics (Transduction.skt_to_html s)
+value skt_roma s = Transduction.skt_to_html s
 (* Function [skt_roma] differs from [Encode.skt_to_roma] 
    because it does not go through encoding [s] as a word,
    and the complications of dealing with possible hiatus. *)
 ;
-value skt_red s = html_red (skt_roma s)
+value skt_roma_it s = skt_roma s |> italics
 ;
-value skt_anchor cached font form = (* for Declension Conjugation *)
+(* ignores possible homo index *)
+value skt_deva s = Encode.skt_strip_to_deva s
+;
+value skt_html_font font s = match font with
+  [ Roma -> skt_roma s | Deva -> skt_deva s ]
+;
+value skt_html s = (* ubiquitous for font *)
+  let font = sanskrit_font.val in
+  skt_html_font font s
+;
+value skt_italics form = 
+  skt_html form |> italics
+;
+value skt_anchor_font font is_cache form = (* for Declension Conjugation *)
   let s = match font with
-          [ Deva -> deva20_blue_center (Encode.skt_raw_strip_to_deva form)
-          | Roma -> skt_roma form (* no stripping in Roma *)
+          [ Deva -> deva20_blue_center (Encode.skt_strip_to_deva form) 
+                    (* NB This removes the possible homo index *)
+          | Roma -> skt_roma_it form (* no stripping in Roma *)
           ]
-  and url_function = if cached then url_cache else url in
+  and url_function = if is_cache then url_cache else url in
   anchor Navy_ (url_function form) s 
 ;
-value skt_anchor_R cached = skt_anchor cached Roma (* for Declension, Indexer *)
-(*i [and skt_anchor_D = skt_anchor Deva] unused i*) 
-and skt_anchor_R2 s s' = anchor Navy_ (url s) (skt_roma s') (* for Indexer *)
+value skt_anchor is_cache = 
+  let font = sanskrit_font.val in
+  skt_anchor_font font is_cache (* for Declension, Indexer *)
+and skt_anchor_R s s' = anchor Navy_ (url s) (skt_roma_it s') (* for Indexer *)
 ;
 value no_hom entry = (* low-level string hacking *)
   match (String.sub entry ((String.length entry)-1) 1) with
@@ -72,27 +87,25 @@ value skt_anchor_M word entry page cache =
   let vocable = if no_hom entry then word 
                 else let pos = (String.length entry)-1 in 
                      word ^ "#" ^ (String.sub entry pos 1) in
-  anchor_mw (skt_roma vocable)
-;
-value skt_graph_anchor_R cache form =
-  let s = skt_roma form in
-  let url_function = if cache then url_cache else url in
-  anchor_graph Navy_ (url_function form) s 
-;
-value printer w = (* do not eta reduce ! *)
-  match sanskrit_display.val with 
-  [ "deva" -> Canon.unidevcode w
-  | "roma" -> Canon.uniromcode w
-  | _ -> failwith "Unknown default display font"
+  anchor_mw (skt_roma_it vocable)
+;
+value skt_graph_anchor is_cache form =
+  let url_function = if is_cache then url_cache else url in
+  anchor_graph Navy_ (url_function form) (skt_italics form)
+;
+(* This is an alternative to [skt_html] above - some cleaning-up is needed *)
+value skt_utf w = (* do not eta reduce ! *)
+  match sanskrit_font.val with 
+  [ Deva -> Canon.unidevcode (Encode.strip w)
+  | Roma -> Canon.uniromcode w
   ]
 ;
-value print_stem w = printer w |> ps (* w in lexicon or not *)
-and print_chunk w = printer w |> ps
-and print_entry w = skt_anchor_R False (Canon.decode w) |> ps (* w in lexicon *)
-and print_ext_entry ps w = skt_anchor_R False (Canon.decode w) |> ps (* idem *)
-and print_cache w = skt_anchor_R True (Canon.decode w) |> ps
-and print_graph_entry w = skt_graph_anchor_R False (Canon.decode w) |> ps
-and print_graph_cache w = skt_graph_anchor_R True (Canon.decode w) |> ps
+value print_stem w = skt_utf w |> ps (* w in lexicon or not *)
+and print_chunk w = skt_utf w |> ps
+and print_entry w = skt_anchor False (Canon.decode w) |> ps (* w in lexicon *)
+and print_cache w = skt_anchor True (Canon.decode w) |> ps
+and print_graph_entry w = skt_graph_anchor False (Canon.decode w) |> ps
+and print_graph_cache w = skt_graph_anchor True (Canon.decode w) |> ps
 ;
 
 (* Used in [Indexer] and [Lemmatizer] *)
@@ -128,8 +141,12 @@ value final w = visargify (Word.mirror w) (* Declension, Conjugation *)
 ; 
 value print_final rw = print_chunk (visargify rw) (* Interface *)
 ;
-value hdecode word = Transduction.skt_to_html (Canon.decode word)
+value hdecode word = 
+  (* [Transduction.skt_to_html (Canon.decode word)] assumes Roma style (IAST) *)
+  Canon.decode word |> skt_html 
 ;
+(* NB This assumes printing skt in Roma style (IAST). 
+   In order to print in Deva style, one should use [skt_utf] above - TODO *)
 value html_blue_off offset text = 
   (* Temporary use of title attribute for XHTML 1.0 Strict offset recording, *)
   (* should be replaced by data-offset for future HTML 5 compliance. *)
@@ -139,7 +156,7 @@ value html_blue_off offset text =
   (elt_begin_attrs [ offset_attr offset ] "span" Blue_)  ^ text ^ span_end 
 ;
 (* indicates offset of segment in attribute "title" of [Blue_] span *)
-value blue_word_off word offset = (* deprecated *)
+value blue_word_off word offset = 
   html_blue_off offset (emph (hdecode word))
 ;
 value print_sandhi u v w = do 
diff --git a/ML/morphology.mli b/ML/morphology.mli
index 378aea74d03c699d01f9677ce486f291b4010609..cde4aae4ef8bb6c526d0ceb82dee2da4c2f21902 100644
--- a/ML/morphology.mli
+++ b/ML/morphology.mli
@@ -4,7 +4,7 @@
 (*                                                                        *)
 (*                              Gérard Huet                               *)
 (*                                                                        *)
-(* ©2019 Institut National de Recherche en Informatique et en Automatique *)
+(* ©2020 Institut National de Recherche en Informatique et en Automatique *)
 (**************************************************************************)
 
 (* Morphology interface *)
diff --git a/ML/parser.ml b/ML/parser.ml
index 0cc970fb6adbc9922d99d0169846c2f8b6a7ac96..bf2535c38f6295755d3c5b4d20e7783142122033 100644
--- a/ML/parser.ml
+++ b/ML/parser.ml
@@ -401,7 +401,9 @@ value parser_engine () = do
     and us = get "us" env "f"
     and translit = get "t" env Paths.default_transliteration 
     and lex = get "lex" env Paths.default_lexicon
-    and font = get "font" env Paths.default_display_font (* deva vs roma print *)
+    and font = get "font" env Paths.default_display_font in 
+    let ft = font_of_string font (* Deva vs Roma print *) in
+    let () = sanskrit_font.val := ft 
     and abs = get "abs" env "f" (* default local paths *) in
     let lang = language_of lex
     and input = decode_url url_encoded_input (* unnormalized string *)
diff --git a/ML/phonetics.ml b/ML/phonetics.ml
index 8f6b652fb4de72d6b8441198e983c706294fd945..8281f3d64ee44ed9067730de93258c65fa3571d0 100644
--- a/ML/phonetics.ml
+++ b/ML/phonetics.ml
@@ -12,12 +12,20 @@
 (* Notation Pr{X} gives X as the pratyaahaara notation of a set of phonemes *)
 
 (* Sanskrit phonology *)
+(* Phoneme (var.na) is implemented as integer from 1 to 49, thus consistent with 
+   ZEN toolkit, with Word.letter = int. Thus the Paninian structure of 
+   pratyahaaras is replaced by simple arithmetic computation. *)
 
-value vowel c = c>0 && c<14 (* a aa i ii u uu .r .rr .l e ai o au *)(* Pr{hac} *)
+(* This representation is not sufficient to represent accent, and a more 
+   sophisticated phonology scheme should be used for that purpose, taking 
+   into account phonetic features, such as SLP1 of the Sanskrit Library. 
+   See Lies of Scharf and Higman. *)
+
+value vowel c = c>0 && c<14 (* a aa i ii u uu .r .rr .l e ai o au *)(* Pr(hac) *)
 and anusvar c = c=14 (* .m : anusvara standing for nasal *)
            (*  || c=15  candrabindu *)
 and visarga c = c=16 (* .h *)
-and consonant c = c>16 (* Pr{hal} *)
+and consonant c = c>16 (* Pr(hal) *)
 and phantom c = c<(-1) (* -2 -3=*a -4=*i -5=*u -6=*r *)
 ;
 (* final s assimilated to visarga *)
@@ -114,15 +122,15 @@ and palatal   c = c > 21 && c < 27 (* palatals     : c ch j jh ~n      *)
 and lingual   c = c > 26 && c < 32 (* cerebrals    : .t .th .d .dh .n  *)
 and dental    c = c > 31 && c < 37 (* dentals      : t th d dh n       *)
 and labial    c = c > 36 && c < 42 (* labials      : p ph b bh m       *)
-and semivowel c = c > 41 && c < 46 (* semi vowels  : y r l v  Pr{ya.n} *)
-and sibilant  c = c > 45 && c < 49 (* sibilants    : z .s s   Pr{zar}  *)
+and semivowel c = c > 41 && c < 46 (* semi vowels  : y r l v  Pr(ya.n) *)
+and sibilant  c = c > 45 && c < 49 (* sibilants    : z .s s   Pr(zar)  *)
 and aspirate  c = c = 49 (* h *)
 ;
 value stop c = c > 16 && c < 42
 ;
 value nasal c = 
      c = 21 (* f *) || c =  26 (* ~n *) || c = 31 (* .n *) 
-  || c = 36 (* n *) || c = 41  (*  m *) || anusvar c (* Pr{~nam} *)
+  || c = 36 (* n *) || c = 41  (*  m *) || anusvar c (* Pr(~nam) *)
 ;
 value n_or_f c =  c = 21 (* f *) || c = 36 (* n *) 
 ;
@@ -164,10 +172,10 @@ value voiced = fun (* voices previous phoneme with homophone *)
   | c  -> c
   ]
 ;
-value voiced_consonant c = (* Pr{jhaz} *)
+value voiced_consonant c = (* Pr(jhaz) *)
   List.mem c [ 19; 20; 24; 25; 29; 30; 34; 35; 39; 40 ]
 
-and mute_consonant c =(* Pr{khay} *)
+and mute_consonant c =(* Pr(khay) *)
   List.mem c [ 17; 27; 32; 37; 18; 22; 23; 28; 33; 38 ]
 ;
 value is_voiced c = (* voiced phonemes *)
@@ -185,17 +193,19 @@ value elides_visarg_aa c =
 ;
 value turns_visarg_to_o c = elides_visarg_aa c || avagraha c
 ;
-value guna = fun
+
+(* Now for the phonetic grades *)
+value guna = fun (* normal grade *)
   [ 1     -> [ 1 ]     (* a is its own guna *)
   | 2     -> [ 2 ]     (* aa is its own guna and vriddhi *)
-  | 3 | 4 -> [ 10 ]    (* e *)
-  | 5 | 6 -> [ 12 ]    (* o *)
-  | 7 | 8 -> [ 1; 43 ] (* ar *)
-  | 9     -> [ 1; 44 ] (* al *)
+  | 3 | 4 -> [ 10 ]    (* e is guna of i and ii *)
+  | 5 | 6 -> [ 12 ]    (* o is guna of u and uu *)
+  | 7 | 8 -> [ 1; 43 ] (* ar is guna of .r and .rr *)
+  | 9     -> [ 1; 44 ] (* al is guna of .l *)
   | c     -> [ c ]
   ]
 ;
-value vriddhi = fun
+value vriddhi = fun (* strong grade *)
   [ 1 | 2           -> [ 2 ]     (* aa *)
   | 3 | 4 | 10 | 11 -> [ 11 ]    (* ai *)
   | 5 | 6 | 12 | 13 -> [ 13 ]    (* au *)
@@ -204,24 +214,28 @@ value vriddhi = fun
   | c               -> [ c ]
   ]
 ;
+(* NB. guna : int -> list int. In Panini, guna : varna -> varna, with
+   guna(.r) = a and vriddhi(.r) = aa, with suutra I.1.51 that affixes "r":
+     Pan(I.1.51): ura.n rapara.h || after a,i,u put r *)
+(* NB. u in ura.n above explained in Kaazikaa for counterex. kheyam and geyam *)
 
 (* Macdonnel §125 - condition for root of gana 1 to take guna of its stem *)
 value gunify = fun (* arg word is reversed stem *)
-  [ [ v :: _ ] when vowel v -> True
-  | [ _ :: [ v :: _ ] ] when short_vowel v -> True 
+  [ [ v :: _ ] when vowel v -> True (* guna is used if root is vowel final *)
+  | [ _ :: [ v :: _ ] ] when short_vowel v -> True (* or penultimate is short *)
   | _ -> False
   ]
 ;
 (* Augment computation *)
-value augment x = (* arg is first letter of root *)
-  if vowel x then vriddhi x
-  else if x = 23 (* ch *) then [ 1; 22; 23 ] (* cch *)
-  else if x>16 && x<50 then [ 1; x ]     (* a prefix of consonant *)
+value augment i = (* i is initial letter of root *)
+  if vowel i then vriddhi i
+  else if i = 23 (* ch *) then [ 1; 22; 23 ] (* cch *)
+  else if consonant i then [ 1; i ]     (* a prefix of consonant *)
   else failwith "Phonetics.augment"
 ;
 value aug = fun (* augment last phoneme of word *)
   [ [ c :: word ] -> augment c @ word
-  | [] -> failwith "Empty stem (aug)"   
+  | [] -> failwith "Empty stem in aug"   
   ]
 ;
 value light = fun (* light roots end in short vowel Pan{6,1,69} *)
@@ -362,7 +376,7 @@ value asp = fun
   | _ -> failwith "Penultimate not vowel"
   ]
 ;
-(* final form of a pada *)
+(* Final form of a pada *)
 (* Warning - finalize does NOT replace s or r by visarga, and fails on visarga *)
 value finalize rstem = match rstem with
   [ [] -> []
diff --git a/ML/reader.ml b/ML/reader.ml
index 06d43a9bd34e70e3b7288b729d27a6f600dbce0b..0b5aa52bb0b1f5b879f23d611e9902b57e5deae4 100644
--- a/ML/reader.ml
+++ b/ML/reader.ml
@@ -214,9 +214,11 @@ value reader_engine () = do
     and us = get "us" env "f" (* default input sandhied *)
     and translit = get "t" env Paths.default_transliteration 
     and lex = get "lex" env Paths.default_lexicon
-    and font = get "font" env Paths.default_display_font (* deva vs roma print *)
+    and font = get "font" env Paths.default_display_font in 
+    let ft = font_of_string font (* Deva vs Roma print *)
     and cache = get "cache" env "f" in
-    let () = cache_active.val := cache
+    let () = sanskrit_font.val := ft 
+    and () = cache_active.val := cache 
     and abs = get "abs" env "f" (* default local paths *) in
     let lang = Html.language_of lex 
     and input = decode_url url_encoded_input (* unnormalized string *)
diff --git a/ML/sanskrit.ml b/ML/sanskrit.ml
index a746297fba2302a8a3750d4fbea9dbfbb9770b98..3cbaf6c7641efef1b1674224a93a983d0672585e 100644
--- a/ML/sanskrit.ml
+++ b/ML/sanskrit.ml
@@ -94,15 +94,15 @@ value trad_skt = trad_string skt1
 value maha_epic = "Mahaabhaarata" (* for [Print_html] *)
   and rama_epic = "Raamaaya.na"
 ;
-value skt_to_tex = Transduction.skt_to_tex;   (* romanisation Tex diacritics *)
-value skt_to_dev = Transduction.skt_to_dev;   (* devanagari devnag *)
-value skt_to_html = Transduction.skt_to_html; (* romanisation *)
+value skt_to_tex = Transduction.skt_to_tex;    (* romanisation Tex diacritics *)
+value skt_to_devnag = Transduction.skt_to_devnag; (* for Tex with devnag *)
+value skt_to_html = Transduction.skt_to_html;  (* romanisation *)
 
 (* Encoding functions skt -> word *)
 value raw_sanskrit_word = Transduction.code_raw; (* no normalisation no accent*) 
 value sanskrit_word = Encode.code_string; (* normalisation *)
 value skt_raw_to_deva = Encode.skt_raw_to_deva; (* devanagari unicode *)
-value skt_raw_strip_to_deva = Encode.skt_raw_strip_to_deva; (* idem *)
+value skt_strip_to_deva = Encode.skt_strip_to_deva; (* id for [Print_html] *)
 value skt_to_anchor = Encode.anchor; (* hypertext anchor encoding *)
 value rev_stem_skt = Encode.rev_stem; (* normalised revword *)
 value normal_stem = Encode.normal_stem; (* normalised stem as word *)
diff --git a/ML/sanskrit.mli b/ML/sanskrit.mli
index b7c43eb36afa5c5212f64c14dc73a7a62a027765..441aa044db1781e8f21f92f5b6c06aea3c0f82a6 100644
--- a/ML/sanskrit.mli
+++ b/ML/sanskrit.mli
@@ -4,7 +4,7 @@
 (*                                                                        *)
 (*                              Gérard Huet                               *)
 (*                                                                        *)
-(* ©2018 Institut National de Recherche en Informatique et en Automatique *)
+(* ©2020 Institut National de Recherche en Informatique et en Automatique *)
 (**************************************************************************)
 
 (*i module Sanskrit : sig i*)
@@ -29,10 +29,10 @@ value trad_skt_list : string -> list skt;
 value maha_epic : skt;
 value rama_epic : skt;
 value skt_to_tex : skt -> string;
-value skt_to_dev : skt -> string;
+value skt_to_devnag : skt -> string;
 value skt_to_html : skt -> string;
 value skt_raw_to_deva : skt -> string;
-value skt_raw_strip_to_deva : skt -> string;
+value skt_strip_to_deva : skt -> string;
 value skt_to_anchor : skt -> string;
 value raw_sanskrit_word : skt -> Word.word;
 value sanskrit_word : skt -> Word.word;
diff --git a/ML/transduction.ml b/ML/transduction.ml
index d9d486aa6e885bfe4a7a0a309612dc7955934128..fb889cdf1cc975bd853d1b44cb05bd1150f22f08 100644
--- a/ML/transduction.ml
+++ b/ML/transduction.ml
@@ -255,8 +255,8 @@ EXTEND Gram (* skt to devnag *)
     [ [ w = LIST0 dev; `EOI -> String.concat "" w ] ];
 END
 ;
-value skt_to_dev = transducer dev_word
-;
+value skt_to_devnag = transducer dev_word
+; 
 (****************************************)
 (* Greek and math symbols, TeX encoding *)
 (****************************************)
diff --git a/ML/verbs.ml b/ML/verbs.ml
index 7041d33c773b5ec9bdde90d50ba1ecf1824b1dcd..568760a86296f55d799e564452300fe725d5f9ae 100644
--- a/ML/verbs.ml
+++ b/ML/verbs.ml
@@ -361,6 +361,7 @@ value weak_stem entry rstem = (* rstem = revstem entry *)
     | "vaz"    -> revcode "uz" (* but not vac ! *)
     | "zaas"   -> revcode "zi.s" 
     | "myak.s" -> revcode "mik.s" 
+(*  | "sad#1"  -> revcode "siid" - incorrect for perfect ! *)
     | _ -> rstem
     ]
 ;
@@ -5967,6 +5968,8 @@ and compute_extra_zaas () =
 and compute_extra_zru () = 
   enter1 "zru" (* ved écoute *) 
          (Conju (impera 5) [ (Singular,[ (Second, code "zrudhi") ]) ])
+and compute_extra_sad () = (* WR E. Mah(1.214.027c) (Gretil) sa.mni.siidatu.h *)
+  enter1 "sad#1" (Conju (Primary,Conjug Perfect Active) [ (Dual,[ (Third, code "siidatus") ]) ])
 and compute_extra_sanj () = (* WR Oberlies p LI but maybe prm of variant sajj *)
   let root = "sa~nj" 
   and conj = Primary
@@ -6037,6 +6040,7 @@ value compute_extra () = do
   ; compute_extra_zaas () 
   ; compute_extra_zru () 
   ; compute_extra_sanj ()
+  ; compute_extra_sad ()
   ; compute_extra_skand () 
   ; compute_extra_syand ()
   ; compute_extra_hims ()
@@ -6088,7 +6092,8 @@ value fake_compute_conjugs (gana : int) (entry : string) = do
       | "zaas"   -> compute_extra_zaas ()
       | "zru"    -> compute_extra_zru () 
       | "sa~nj"  -> compute_extra_sanj () 
-      | "skand"  -> compute_extra_skand ()
+      | "sa~nj"  -> compute_extra_sanj () 
+      | "sad#1"  -> compute_extra_sad ()
       | "spaz#1" -> record_part_ppp (revcode "spa.s.ta") entry
       | "syand"  -> compute_extra_syand ()
       | "hi.ms"  -> compute_extra_hims ()
diff --git a/ML/version.ml b/ML/version.ml
index 87c282d1aa0411291f2f1e4d9acafba83661fb51..dca417de0522a10f4ad1a14b00e4b2cd36b9ac68 100644
--- a/ML/version.ml
+++ b/ML/version.ml
@@ -8,4 +8,4 @@
 (**************************************************************************)
 
 (* Generated by make version - see main Makefile *)
-value version="3.23" and version_date="2020-05-28";
+value version="3.23" and version_date="2020-06-04";
diff --git a/ML/web.ml b/ML/web.ml
index fb708d497ec8648f86b2059d37a9bd09ad3e9f6e..78f44d1460da2c081e0ac321b5f8b7140ec5f7f0 100644
--- a/ML/web.ml
+++ b/ML/web.ml
@@ -142,6 +142,9 @@ and string_of_font = fun
   | Roma -> "roma"
   ] 
 ;
+(* Global communicating the Sanskrit display font to [Morpho_html] *)
+value sanskrit_font = ref (Paths.default_display_font |> font_of_string)
+;
 value pr_roma code = (* roman with diacritics *)
   ps (html_red (Canon.uniromcode code) ^ " ") 
 and pr_deva code = (* devanagari *)
@@ -160,9 +163,6 @@ and pr_i font word = do (* special for iic *)
   ; print_string " "
   }
 ;
-(* Global communicating the Sanskrit display font to [Morpho_html] *)
-value sanskrit_display = ref Paths.default_display_font
-;
 value meta_program l = List.iter pl (List.map meta_prefix l)
 ;
 value javascript ref =
diff --git a/SETUP/version.txt b/SETUP/version.txt
index b25dfeb152bd5cb7f74ff4d41bbf0a5a9be705f5..26107d775fdc596688c7ab2550b5fcf88d36809d 100644
--- a/SETUP/version.txt
+++ b/SETUP/version.txt
@@ -1,2 +1,2 @@
 VERSION='3.23'
-DATE='2020-05-28'
+DATE='2020-06-04'