fixed bugs, but more happened