try and fix some stuf