Fixed some stuf, we're screwed