diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt
index c5da6ba8..3fd9e409 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/csv/CSVDescriptor.kt
@@ -147,9 +147,9 @@ abstract class CSVDescriptor(var source: DataSource, vararg elements: CSVField)
 				count++
 			}
 		}
-		val mandatoryfields = this.fields.filter { it.optional == false }
+		val mandatoryFields = this.fields.filter { !it.optional }
 		Timber.d("source= ${this.source.name} > total fields = ${this.fields.size}, identified = $count")
-		return count >= mandatoryfields.size
+		return count >= mandatoryFields.size
 	}
 
 	protected val csvHeaders: String
diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/CSVField.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/CSVField.kt
index 1fc52eb4..3cedd81a 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/csv/CSVField.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/csv/CSVField.kt
@@ -123,7 +123,7 @@ interface TournamentFeaturesCSVField : TypedCSVField<List<TournamentFeature>> {
 	}
 
 	override fun format(data: List<TournamentFeature>?): String? {
-		return data?.joinToString(",") { it.name }
+		return data?.joinToString(CSVField.separator) { it.name }
 	}
 
 }
@@ -178,6 +178,11 @@ interface TypedCSVField<T> : CSVField {
 
 interface CSVField {
 
+	companion object {
+		const val delimiter = "\""
+		const val separator = "|"
+	}
+
 	val header: String
 	val optional: Boolean
 		get() {
diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/PACSVDescriptor.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/PACSVDescriptor.kt
index cd33448d..5626d26f 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/csv/PACSVDescriptor.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/csv/PACSVDescriptor.kt
@@ -187,7 +187,7 @@ abstract class PACSVDescriptor<T : Identifiable>(source: DataSource, private var
 						field.parse(value)
 					is SessionField.TournamentEntryFee -> session.tournamentEntryFee = field.parse(value)
 					is SessionField.TournamentFeatures -> {
-						value.split(",").forEach { featureName ->
+						value.split(CSVField.separator).forEach { featureName ->
 							val tournamentFeature: TournamentFeature = realm.getOrCreate(featureName)
 							session.tournamentFeatures.add(tournamentFeature)
 						}
diff --git a/app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt b/app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt
index b4d91075..26dfd148 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/csv/ProductCSVDescriptors.kt
@@ -217,8 +217,7 @@ class ProductCSVDescriptors {
                     SessionField.TournamentName("Tournament Name"),
                     SessionField.TournamentEntryFee("Entry fee"),
                     SessionField.TournamentNumberOfPlayers("Number of players"),
-                    SessionField.TournamentFeatures("Number of players"),
-                    SessionField.TournamentPrizePool("Prize Pool"),
+                    SessionField.TournamentFeatures("Tournament Features"),
                     SessionField.TournamentPosition("Position"),
                     SessionField.Comment("Comment")
                 )