Fixing up rules and diacritics, quite a bit more to come