Add comments and make report more report-y