Tweaked a whole bunch of stuff.