Fix report format, and add validation.