fix bugs
fix bigger bugs