fixing some stuf