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

Improvements to import scenarios