fix bugs & style modify