diff --git a/src/fst/morphology/affixes/verb_inner_affixes.lexc b/src/fst/morphology/affixes/verb_inner_affixes.lexc
index 318d926..6242c14 100644
--- a/src/fst/morphology/affixes/verb_inner_affixes.lexc
+++ b/src/fst/morphology/affixes/verb_inner_affixes.lexc
@@ -1,4 +1,4 @@
-Multichar_Symbols @D.OBJECTPERSON@ @D.PREFIX@ @D.SUBJECTPERSON.4@ @D.VALENCE.TRANSITIVE@ @P.DISTRIBUTIVE.OFF@ @P.DISTRIBUTIVE.ON@ @P.PREFIX.MIDDLE@ @R.DISTRIBUTIVE.OFF@ @R.DISTRIBUTIVE.ON@ @R.OBJECTNUMBER.PL@ @R.OBJECTNUMBER.SG@ @R.OBJECTPERSON@ @R.OBJECTPERSON.1@ @R.OBJECTPERSON.2@ @R.OBJECTPERSON.3@ @R.OBJECTPERSON.4@ @R.OBJECTPERSON.RECIP@ @R.OBJECTPERSON.REFL@ @R.OBJECTPERSON.INDEF@ @D.OBJECTPERSON.INDEF@ @R.PREFIX.INNER@ @R.PREFIX.MIDDLE@ @R.PREFIX.OUTER@ @R.SUBJECTNUMBER.PL@ @R.SUBJECTNUMBER.SG@ @R.SUBJECTPERSON.3@ @R.SUBJECTPERSON.4@ @U.ASPECT.IPFV@ @U.ASPECT.PFV@ @U.ASPECT.POT@ @U.ASPECT.PROG@ @U.OBJECTNUMBER.PL@ @U.OBJECTNUMBER.SG@ @U.OBJECTPERSON.1@ @U.OBJECTPERSON.2@ @U.OBJECTPERSON.3@ @U.OBJECTPERSON.4@ @U.OBJECTPERSON.RECIP@ @U.OBJECTPERSON.REFL@ @U.PREFIX.OUTER@ @U.SUBJECTNUMBER.PL@ @U.SUBJECTNUMBER.SG@ @U.SUBJECTPERSON.1@ @U.SUBJECTPERSON.2@ @U.SUBJECTPERSON.3@ @U.SUBJECTPERSON.4@ @U.TAMA.%0@ @U.TAMA.%0-STAT@ @U.TAMA.i@ @U.TAMA.isi@ @U.TAMA.ni@ @U.TAMA.si@ @U.TAMA.yi-a@ @U.TAMA.yi-y@ @U.TAMA.yi@ @U.VALENCE.DITRANSITIVE@ @U.VALENCE.OO-EXPERIENCER@ @U.VALENCE.DO-EXPERIENCER@ @U.VALENCE.IMPERSONAL@ @U.VALENCE.INTRANSITIVE@ @U.VALENCE.OBLIQUEOBJECT@ @U.VALENCE.TRANSITIONAL@ @U.VALENCE.TRANSITIVE@ @U.VV.%0@ @U.VV.S@ @U.VV.I@ @D.VALENCE.TRANSITIONAL@ @D.OBJECTPERSON.3@ @D.OBJECTNUMBER.SG@ @D.SUBJECTPERSON.3@ @U.DIRECTOBJECT.GIVEN@ @D.DIRECTOBJECT.GIVEN@ @U.DIRECTOBJECT.EMPHATIC@ @D.DIRECTOBJECT.EMPHATIC@ @U.DIRECTOBJECT.NONE@ @U.DIALECT.BIGCROW@ @U.DIALECT.BIGPLUME@ @U.DIALECT.CROWCHIEF@ @R.LOWTONE.ON@ @P.LOWTONE.ON@ @D.LOWTONE@ i2 s2 s3 ^L
+Multichar_Symbols @D.OBJECTPERSON@ @D.PREFIX@ @D.SUBJECTPERSON.4@ @D.VALENCE.TRANSITIVE@ @P.DISTRIBUTIVE.OFF@ @P.DISTRIBUTIVE.ON@ @P.PREFIX.MIDDLE@ @R.DISTRIBUTIVE.OFF@ @R.DISTRIBUTIVE.ON@ @R.OBJECTNUMBER.PL@ @R.OBJECTNUMBER.SG@ @R.OBJECTPERSON@ @R.OBJECTPERSON.1@ @R.OBJECTPERSON.2@ @R.OBJECTPERSON.3@ @R.OBJECTPERSON.4@ @R.OBJECTPERSON.RECIP@ @R.OBJECTPERSON.REFL@ @R.OBJECTPERSON.INDEF@ @D.OBJECTPERSON.INDEF@ @R.PREFIX.INNER@ @R.PREFIX.MIDDLE@ @R.PREFIX.OUTER@ @R.SUBJECTNUMBER.PL@ @R.SUBJECTNUMBER.SG@ @R.SUBJECTPERSON.3@ @R.SUBJECTPERSON.4@ @U.ASPECT.IPFV@ @U.ASPECT.PFV@ @U.ASPECT.POT@ @U.ASPECT.PROG@ @U.OBJECTNUMBER.PL@ @U.OBJECTNUMBER.SG@ @U.OBJECTPERSON.1@ @U.OBJECTPERSON.2@ @U.OBJECTPERSON.3@ @U.OBJECTPERSON.4@ @U.OBJECTPERSON.RECIP@ @U.OBJECTPERSON.REFL@ @U.PREFIX.OUTER@ @U.SUBJECTNUMBER.PL@ @U.SUBJECTNUMBER.SG@ @U.SUBJECTPERSON.1@ @U.SUBJECTPERSON.2@ @U.SUBJECTPERSON.3@ @U.SUBJECTPERSON.4@ @U.TAMA.%0@ @U.TAMA.%0-STAT@ @U.TAMA.i@ @U.TAMA.isi@ @U.TAMA.ni@ @U.TAMA.si@ @U.TAMA.yi-a@ @U.TAMA.yi-y@ @U.TAMA.yi@ @U.VALENCE.DITRANSITIVE@ @U.VALENCE.OO-EXPERIENCER@ @U.VALENCE.DO-EXPERIENCER@ @U.VALENCE.IMPERSONAL@ @U.VALENCE.INTRANSITIVE@ @U.VALENCE.OBLIQUEOBJECT@ @U.VALENCE.TRANSITIONAL@ @U.VALENCE.TRANSITIVE@ @U.VV.%0@ @U.VV.S@ @U.VV.I@ @D.VALENCE.TRANSITIONAL@ @D.OBJECTPERSON.3@ @D.OBJECTNUMBER.SG@ @D.SUBJECTPERSON.3@ @U.DIRECTOBJECT.GIVEN@ @D.DIRECTOBJECT.GIVEN@ @U.DIRECTOBJECT.EMPHATIC@ @D.DIRECTOBJECT.EMPHATIC@ @U.DIRECTOBJECT.NONE@ @U.DIALECT.BIGCROW@ @U.DIALECT.BIGPLUME@ @U.DIALECT.CROWCHIEF@ @R.LOWTONE.ON@ @P.LOWTONE.ON@ @D.LOWTONE@ i2 s2 s3 ^L ^P
 
 LEXICON Root
 
@@ -712,19 +712,19 @@ LEXICON ni-PFV-AFF-NoPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìní   #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìní   #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@^Pní   #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@^Pní   #; ! FLOATING L-TONE
 
 LEXICON ni-PFV-AFF-InnerPrefix
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìnis  #; ! FLOATING L-TONE (M/L -> L)
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìní   #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìní   #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìnaà  #; ! FLOATING L-TNE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìniì   #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìniì  #; ! FLOATING L-NE
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìnas2 #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìní   #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìní   #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@^Pnis  #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Pní   #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@^Pní   #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Pnaà  #; ! FLOATING L-TNE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Pniì   #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Pniì  #; ! FLOATING L-NE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Pnas2 #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@^Pní   #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@^Pní   #; ! FLOATING L-TONE
 
 LEXICON ni-PFV-AFF-OuterPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
@@ -734,8 +734,8 @@ LEXICON ni-PFV-AFF-OuterPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìní   #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìní   #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@^Pní   #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@^Pní   #; ! FLOATING L-TONE
 
 
 LEXICON nis-PFV-AFF-NoPrefix
@@ -747,19 +747,19 @@ LEXICON nis-PFV-AFF-NoPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìnís  #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìnís  #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@^Pnís  #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@^Pnís  #; ! FLOATING L-TONE
 
 LEXICON nis-PFV-AFF-InnerPrefix
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìnis  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìnís  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìnís  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìnaà  #; ! FLOATING L-TNE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìniì   #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìniì #; ! FLOATING L-NE
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìnas2 #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìnís  #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìnís  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@^Pnis  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Pnís  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@^Pnís  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Pnaà  #; ! FLOATING L-TNE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Pniì   #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Pniì #; ! FLOATING L-NE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Pnas2 #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@^Pnís  #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@^Pnís  #; ! FLOATING L-TONE
 
 LEXICON nis-PFV-AFF-OuterPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
@@ -782,20 +782,20 @@ LEXICON nii-PFV-AFF-NoPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìníí  #;	! FLOATING L-TONE
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìníí  #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@^Pníí  #;	! FLOATING L-TONE
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@^Pníí  #; ! FLOATING L-TONE
 
 LEXICON nii-PFV-AFF-InnerPrefix
 ! FIXME: no documentation for this form; dummy values below
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìnis  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìníí  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìníí  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìnaà  #; ! FLOATING L-TNE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìniì   #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìniì #; ! FLOATING L-NE
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìnas2 #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìníí  #; ! FLOATING L-TONE
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìníí  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@^Pnis  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Pníí  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@^Pníí  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Pnaà  #; ! FLOATING L-TNE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Pniì   #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Pniì #; ! FLOATING L-NE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Pnas2 #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@^Pníí  #; ! FLOATING L-TONE
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@^Pníí  #; ! FLOATING L-TONE
 
 LEXICON nii-PFV-AFF-OuterPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
@@ -884,23 +884,23 @@ LEXICON si-AFF-InnerPrefix
 ! When an inner prefix is present, 1SG forms also appear as Cas (e.g.,
 ! dìsists'ón ~ dasts'ón "I heard (it)", zìsisyín ~ zasyín "I killed (it)".
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@as    #;
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsí   #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Psí   #; ! FLOATING L-TONE
 @U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìs3   #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà  #; ! FLOATING L-TNE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì  #; ! FLOATING L-NE
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Psaà  #; ! FLOATING L-TNE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Psiì  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Psiì  #; ! FLOATING L-NE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Psas2 #; ! FLOATING L-TONE
 @R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìs3   #;
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìs3   #;
 
 LEXICON si-AFF-MiddlePrefix
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìsis  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsí   #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@^Psis  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Psí   #; ! FLOATING L-TONE
 @U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìs3   #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà  #; ! FLOATING L-TNE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì  #; ! FLOATING L-TONE
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì  #; ! FLOATING L-NE
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Psaà  #; ! FLOATING L-TNE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Psiì  #; ! FLOATING L-TONE
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Psiì  #; ! FLOATING L-NE
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Psas2 #; ! FLOATING L-TONE
 @R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@s3    #;
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@s3    #;
 
@@ -932,29 +932,29 @@ LEXICON sis-AFF-NoPrefix
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@s3    #;
 
 LEXICON sis-AFF-InnerPrefix
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìsis  #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@^Psis  #; ! FLOATING L-TONE (M/L -> L)
 ! When an inner prefix is present, 1SG forms also appear as Cas (e.g.,
 ! dìsists'ón ~ dasts'ón "I heard (it)", zìsisyín ~ zasyín "I killed (it)".
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@as    #;
 ! FIXME: No documentation of 2SG forms of sis-PFV verbs with /l/-initial stems.
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsís  #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Psís  #; ! FLOATING L-TONE (M/L -> L)
 @U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìs3   #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà  #; ! FLOATING L-TONE (M/L ->L)
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì  #; ! FLOATING L-TONE (M/L -> L)
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì  #; ! FLOATING L-TONE (M/L -L)
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Psaà  #; ! FLOATING L-TONE (M/L ->L)
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Psiì  #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Psiì  #; ! FLOATING L-TONE (M/L -L)
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Psas2 #; ! FLOATING L-TONE (M/L -> L)
 @R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìs3   #;
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìs3   #;
 
 LEXICON sis-AFF-MiddlePrefix
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìsis  #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@^Psis  #; ! FLOATING L-TONE (M/L -> L)
 ! FIXME: No documentation of 2SG forms of sis-PFV verbs with /l/-initial stems.
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsís  #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Psís  #; ! FLOATING L-TONE (M/L -> L)
 @U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìs3   #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà  #; ! FLOATING L-TONE (M/L ->L)
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì  #; ! FLOATING L-TONE (M/L -> L)
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì  #; ! FLOATING L-TONE (M/L -L)
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Psaà  #; ! FLOATING L-TONE (M/L ->L)
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Psiì  #; ! FLOATING L-TONE (M/L -> L)
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Psiì  #; ! FLOATING L-TONE (M/L -L)
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Psas2 #; ! FLOATING L-TONE (M/L -> L)
 @R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@s3    #;
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@s3    #;
 
@@ -984,27 +984,27 @@ LEXICON sii-AFF-NoPrefix
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@s3    #;	
 
 LEXICON sii-AFF-InnerPrefix
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìsis  #;
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@^Psis  #;
 ! When an inner prefix is present, 1SG forms also appear as Cas (e.g.,
 ! dìsists'ón ~ dasts'ón "I heard (it)", zìsisyín ~ zasyín "I killed (it)".
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@as    #;
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsíí  #;
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Psíí  #;
 @U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìs3   #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì  #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì #;
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #;
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Psaà #;
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Psiì  #;
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Psiì #;
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Psas2 #;
 @R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ìs3   #;
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ìs3   #;
 
 LEXICON sii-AFF-MiddlePrefix
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@ìsis  #;
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ìsíí  #;
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@^Psis  #;
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@^Psíí  #;
 @U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ìs3   #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@ìsaà #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@ìsiì  #;
-@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@ìsiì #;
-@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@ìsas2 #;
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@^Psaà #;
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@^Psiì  #;
+@U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@^Psiì #;
+@U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@^Psas2 #;
 @R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@s3    #;
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@s3    #;