Encoding issues fixed, performance enhanced