Modify CSV reporting and saving
Fix #62 #69 Modify CSV reporting and save