Finish iteration changes, minor script tweaks