fixed (?) ZWJ again
fixed ZWJ and ZWNJ in four files