Fixed some stuf..