Added and changed a bunch of things.