improved utf-8 handling
less magic / more magic