reformat code & catch all nonfatal exceptions, per committer feedback
Merge branch 'mx_multiseed' into mx