adjusted a few things