Fixed some things, hopefully it'll suck less.