Support for large CSV and other improvements