Finished update and fix bugs.