More of the report, code touchups