a bit step!
fix some bugs