Finish Project1

Do some changes to part2 and then finish all works in project1.