Now saves intermediate results for incremental computation
Introducing some defensive cutting of generated output
Fixing makefile size