fix bugs and change something