fengx

clearup some Function  and fix some bugs