Tweaked a bunch of stuff.