Co-Optimization of Fuels & Engines: Efficiency Merit Function for Spark-Ignition Engines; Revisions and Improvements Based on FY16-17 Research