diff --git a/AuroraRecordGenerator/RecordEditor.xaml b/AuroraRecordGenerator/RecordEditor.xaml
index b57c511..20ac1bc 100644
--- a/AuroraRecordGenerator/RecordEditor.xaml
+++ b/AuroraRecordGenerator/RecordEditor.xaml
@@ -109,7 +109,7 @@
                                 <TextBlock Grid.Column="2" HorizontalAlignment="Left" Margin="5,57,0,0" TextWrapping="Wrap" Text="Citizenship" VerticalAlignment="Top" />
                                 <ComboBox Grid.Column="0" x:Name="SubSpeciesCombo" Margin="10,120,5,0"
                                     VerticalAlignment="Top"
-                                    ToolTip="Your character's species. Required."
+                                    ToolTip="Your character's ethnic group or subtype."
                                     SelectionChanged="SpeciesSelectChanged" Height="26"
     />
                                 <TextBlock Grid.Column="0" Margin="10,104,10,0" TextWrapping="Wrap"
diff --git a/AuroraRecordGenerator/RecordEditor.xaml.cs b/AuroraRecordGenerator/RecordEditor.xaml.cs
index 864d4f6..aebe7de 100644
--- a/AuroraRecordGenerator/RecordEditor.xaml.cs
+++ b/AuroraRecordGenerator/RecordEditor.xaml.cs
@@ -150,15 +150,9 @@ namespace AuroraRecordGenerator
 
 		private static IEnumerable<string> GetSpeciesOptions() => Enum.GetValues(typeof(SpeciesSubType)).Cast<SpeciesSubType>().Select(Utility.SubspeciesNiceName);
 
-		private static IEnumerable<string> GetSpeciesOptions(SpeciesType limitTo)
-		{
-			var targetAttr = limitTo.GetAttributeOfType<SubspeciesMetaAttribute>()?.AssociatedSpecies;
-			if (targetAttr == null)
-				return GetSpeciesOptions();
-			return from item in Enum.GetValues(typeof(SpeciesSubType)).Cast<SpeciesSubType>()
-				let attr = item.GetAttributeOfType<SubspeciesMetaAttribute>()
-				where attr != null && attr.AssociatedSpecies == targetAttr
-				select Utility.SubspeciesNiceName(item);
-		}
+		private static IEnumerable<string> GetSpeciesOptions(SpeciesType limitTo) => from item in Enum.GetValues(typeof(SpeciesSubType)).Cast<SpeciesSubType>()
+																					 let attr = item.GetAttributeOfType<SubspeciesMetaAttribute>()
+																					 where attr != null && (attr.AssociatedSpecies == limitTo || attr.AssociatedSpecies == SpeciesType.None)
+																					 select Utility.SubspeciesNiceName(item);
 	}
 }
\ No newline at end of file
diff --git a/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs b/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
index 021abc2..565d9b9 100644
--- a/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
+++ b/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
@@ -16,7 +16,7 @@ namespace AuroraRecordGenerator
 			record.AppendLine(_targetRecord.Species.HasGender()
 				? $"Gender: {_targetRecord.Gender.Humanize()}"
 				: "Gender: Not Applicable.");
-			record.AppendLine($"Citizenship: {_targetRecord.Citizenship.IfEmpty("None.")}");
+			record.AppendLine($"Citizenship: {_targetRecord.Citizenship.IfEmpty("Not Specified.")}");
 			record.AppendLine($"Clearance Level: {_targetRecord.Clearance.IfEmpty("Not Specified")}");
 			record.AppendLine($"Employed As: {_targetRecord.EmployedAs.IfEmpty("Assistant")}");
 			if (_targetRecord.CharHeight != null)
@@ -27,8 +27,8 @@ namespace AuroraRecordGenerator
 
 			// identifying features
 			var trimmedFeatures = _targetRecord.DistinguishingFeatures.Trim();
-			if (trimmedFeatures.Length > 0)
-				record.AppendLine($"Distinguishing Features: {trimmedFeatures}");
+			record.Append("Distinguishing Features: ");
+			record.AppendLine(trimmedFeatures.Length > 0 ? trimmedFeatures : "None noted.");
 
 			record.AppendLine();
 
diff --git a/AuroraRecordGenerator/Types.cs b/AuroraRecordGenerator/Types.cs
index a1aba93..88ca55d 100644
--- a/AuroraRecordGenerator/Types.cs
+++ b/AuroraRecordGenerator/Types.cs
@@ -34,7 +34,7 @@ namespace AuroraRecordGenerator
 	[ProtoContract]
 	public enum SpeciesSubType
 	{
-		[ProtoEnum]
+		[ProtoEnum, SubspeciesMeta(SpeciesType.None, "N/A")]
 		None = 0,
 
 		[ProtoEnum, SubspeciesMeta(SpeciesType.Tajara, "M'sai")]