Changes to control export and minor clean up to fix wording