Some bug fixed and interface changing