Several corrections, report almost finished (need to clear up the mock data)