Add proper unicode support... for less than 1M

Fixed our oldest open issue... with less than a 1M total change to filesize!