Chinese Support

And some other adjustments