Added/changed several things.