Fix some  bug and  so so .