fix one bug and add a unicode bug, such is life