Add: handling unicode, some fixes