Fix up a bunch of things (based off Iran's)