streamline big run to the interesting cases
(#563)
reinstate missing imports
(#563)