fix bugs to finish
fix bugs to finish