fix bugs and modify details