some bugs fixed.look at new