fixed some buggggs