Fixed some bugs, and made some efficiency improvements (plus, parallel
code that I missed!).