Changed a bunch of stuff