Correction to routes and mapping wording
Changes to control export and minor clean up to fix wording
Merge pull request #198 from reciprocity/feature/carlos_import_clean_up

Fixes import problems from integration and route changes