Fine tunings, fixed unicode problems