Substantial improvements to cruncher.cpp