some bugs have fixed.