Tweaked a lot of stuff