tweaked a bunch of stuff