faster csv reader, various fixes