Change delimiter, tackle commas