minor tweaks
Added support for quoted fields