correct some bugs and responsive problems