Some bug are fixed. Almost finished this project.