1) omit mvtnorm fix, no longer needed
2) re-format some too-long lines