fix some other stuff