some more refactor, delimiter options added to config