Lots of fixes, and a configurable delimiter!