change some thing and fix some bug