many fixes and supporting tests for Japanese support