Tweaked a few small things