Additional mods to previous commit (still discussing UTF8 enforcing)