Optimizations, included output, simplifications.