Word completion tweaks