fix some bugs
fix little bugs