lang and some fix