stupid bug
fix a few bugs & improve