better,better,better, fix bugs