fix bugs and change outlooking