Changed a bunch of things, everything is awesome now