bug fixed and more

相应小改动