change style, fix bugs.