Tweaked a couple of things