correct some error
add some change