Changes

Changed a bunch of stuff