fixed some stuf