support for code point and some fixes