bug fix and change laguage