More report, fixed related nits.