Lots of bug fixes and new develoments. Results match Jacobs' output.