fix other stuff