fix bug1,2,3,5-10