6.1,fix some errors