Add page to tracking report

plus other cleanup and found some report_name variables still