Fix some bugs and make some tweaks to the cruncher.