Shrink the block boundaries of the Calcinator to match its model, clean up the WavefrontObject class some more