Adjusted a few things