Add working Unicode reader, use it in place of the old stuff