More erg syntax and formatting changes.