Add more comments and some fixes

5 jobs for refactor-csv-database in 11 minutes and 18 seconds