fixin other stuff