updated several files, now switching to NFC instead of NFD