Fix some bug of program
manual merge