3.1 Output optimization
Several corrections