these fixes are the shit
changes