fix some bug and US support the dictionary