UTF-8 Bug Fix and some Other Changes

The Main UTF-8 Bug is been fixed, some other changes also apply.