Tweaked a few more things