fixed major issues with unicode