Changed a bunch of things