Tweaked a few things