Fixed missing row numbers in report, cleaned up outdated stuff