Cleanup,fix confict commit, and also revert back Full-width punctuation in Traditional Chinese,also update.