updates to make serial/parallel runs work better