more reordering of tasks
Merge pull request #71 from grahamb/hotfix-restart

more reordering of tasks