fix some bugs bunnies