fix some bugs but still has...
fix some bugs but still has...