fixed a few things Justin requested