Tweaked a few values, seems to work a bit better