fix some bugs
fix someBugs