Tidying as per Petr's suggestions
Merge pull request #734 from hflynn/rebased/develop/in-place-update

Improvements to import scenarios (rebased onto develop)