fix some small things
fix bug