Changes

Changed a lot of the things that needed to be updated.