Added/changed a bunch of things.