Priority gone to the Unicode version. Various bugfixes.