Changed from JavaCSV to openCSV; Minor updates