diff --git a/dictsource/en_list b/dictsource/en_list
index 64e48b79..8b2cc510 100644
--- a/dictsource/en_list
+++ b/dictsource/en_list
@@ -2067,6 +2067,7 @@ gi		$abbrev $allcaps
 gig		gIg
 gilead		g'Iliad
 gimme		gImi
+gini		dZi:ni
 giraffe		dZI#raaf
 github		gIthVb
 giveaway	gIva#weI
@@ -2932,7 +2933,6 @@ phoenix		fi:nIks
 photographer	f@t'0gr@f3
 photography	f@t'0gr@fi
 photolysis	foUt'0l@sIs
-piano		pI'anoU
 piecemeal	p'i:sm,i:l
 pier		pi@3
 pigheaded	$2
@@ -5197,7 +5197,6 @@ Vries		vri:s
 Wegener		veIg@n3
 Wii		wi::
 Wiimote		wi:moUt
-?!3 William	wIli@m
 Willis		$alt1
 xeon		zi:0n
 Yaesu		jeIsu:
diff --git a/dictsource/en_rules b/dictsource/en_rules
index b0f25072..e0280e51 100644
--- a/dictsource/en_rules
+++ b/dictsource/en_rules
@@ -160,7 +160,7 @@
         aor        eI'o@
      m) ao (ri     aU
      _) a (qu      a#
-    _s) a (g@      @
+    _s) a (gac     @
         aqu (aK    akw
         aqu (ariA  a#kw
         aqua (t    @kwa
@@ -3392,7 +3392,7 @@ _it_separ) ate (_  @t
     XC) ia         aI|@
     _t) ia         i:@
     XC) ia (_      i@
-     &) iac (_     =Iak
+     &) iac (_     =iak
      &) ian (_NS1  n
      j) ia (ng     jA#
      &) ians (_NS2 nz
@@ -3400,7 +3400,7 @@ _it_separ) ate (_  @t
      C) iar        aI3
 ?8   C) iar        aIa#
         iar (iC    i@3
-        iar (ity   Iar
+        iar (ity   iar
      &) iary       =j@ri
     &l) iary       =i@ri
      _) ian        i@n
@@ -3408,9 +3408,9 @@ _it_separ) ate (_  @t
      &) ia (_      =i@
     @@) ia (_      =i@
      @) iae (_     =Ii:
-     @) ian (cy    I|@n
+     @) ian (cy    i|@n
      l) iais       i:'eIz
-     p) ia (no     Ia
+     p) ia (no+    ia
      f) ia (b      aI|@
      r) ia (b      I2@
      t) ia (b      I2@
@@ -3418,32 +3418,32 @@ _it_separ) ate (_  @t
     &l) iage (_    I2I2dZ
         iah (_     'aI@
         ia (m_     i@
-  will) ia (m      j@
+?3 ill) ia (m      j@
      &) ia (n      i@
      @) ia (nd     I'a
      @) ia (nic    I'a
      @) ia (nit    I'a
-        ia (na_    i:'A:
+        ia (na_    i'A:
         ia (ng_    ja
-    _f) ia (nc     I'0
-    _f) iance      I'0nseI
+    _f) ia (nc     i'0
+    _f) iance      i'0nseI
     ef) ia (nce    'aI@
      l) ia (nce    'aI@
-    &l) ia (nce    i:@
-        ia (no_    I'A:
+    &l) ia (nce    i@
+        ia (no_    i'A:
      f) ia (nt     'aI@
     pl) ia (nt     'aI@
-   ill) ia (nt     I@
-    al) ia (nt     I@
+   ill) ia (nt     i@
+    al) ia (nt     i@
     _p) ia (nA     i@
         iar        aI3
     @l) iar (_     i@3
-        iara (_    I'A:r@
+        iara (_    i'A:r@
         iarch      I2A@k
         iard (_    I23d
         iai (+     I2aI
      @) iate (_    =I2eIt
-     g) iate (_    I|@t
+     g) iate (_    i|@t
         iath       'aI@T
      @) ia (tive   =i@