fixing other stuff