lots of fixes
Parallelize some work.