fix a lot of bug
fix bugs again