fixed a few buggies