fixes for everything
more stuff