diff --git a/CharacterRecordsGenerator.sln b/CharacterRecordsGenerator.sln
index 9a8724e..cc2f943 100644
--- a/CharacterRecordsGenerator.sln
+++ b/CharacterRecordsGenerator.sln
@@ -9,18 +9,24 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Debug|x64.ActiveCfg = Debug|x64
 		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Debug|x64.Build.0 = Debug|x64
+		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Debug|x86.ActiveCfg = Debug|x86
+		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Debug|x86.Build.0 = Debug|x86
 		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Release|x64.ActiveCfg = Release|x64
 		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Release|x64.Build.0 = Release|x64
+		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Release|x86.ActiveCfg = Release|x86
+		{2E1295C2-7BD9-454E-B13E-8A22448DD5F6}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CharacterRecordsGenerator/CRG.ico b/CharacterRecordsGenerator/CRG.ico
new file mode 100644
index 0000000..11f3ebe
Binary files /dev/null and b/CharacterRecordsGenerator/CRG.ico differ
diff --git a/CharacterRecordsGenerator/CharacterRecordsGenerator.csproj b/CharacterRecordsGenerator/CharacterRecordsGenerator.csproj
index b530186..64e5d4a 100644
--- a/CharacterRecordsGenerator/CharacterRecordsGenerator.csproj
+++ b/CharacterRecordsGenerator/CharacterRecordsGenerator.csproj
@@ -70,6 +70,31 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>CRG.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
@@ -184,6 +209,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CRG.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CharacterRecordsGenerator/Record.cs b/CharacterRecordsGenerator/Record.cs
index 714d22b..27e1546 100644
--- a/CharacterRecordsGenerator/Record.cs
+++ b/CharacterRecordsGenerator/Record.cs
@@ -65,21 +65,22 @@ namespace CharacterRecordsGenerator
         // 19 was used for MedicalPublicRecord, now empty
 
         [ProtoMember(20)]
-        public string MedicalHistory { get; set; } = string.Empty;
+        public string MedicalAllergies { get; set; } = string.Empty;
 
         [ProtoMember(21)]
-        public string MedicalNotes { get; set; } = string.Empty;
+        public string MedicalCurrentPrescriptions { get; set; } = string.Empty;
 
         [ProtoMember(22)]
-        public string MedicalPsychHistory { get; set; } = string.Empty;
+        public string MedicalHistory { get; set; } = string.Empty;
 
         [ProtoMember(23)]
-        public string MedicalPsychNotes { get; set; } = string.Empty;
+        public string MedicalSurgicalHistory { get; set; } = string.Empty;
 
         [ProtoMember(24)]
         public bool NoBorg { get; set; } = false;
 
-        // 25 was NoClone, now unused
+        [ProtoMember(25)]
+        public string MedicalPsychDisorders { get; set; } = string.Empty;
 
         [ProtoMember(26)]
         public bool NoRevive { get; set; } = false;
@@ -88,9 +89,10 @@ namespace CharacterRecordsGenerator
         public bool NoProsthetic { get; set; } = false;
 
         [ProtoMember(28)]
-        public string MedicalPrescriptions { get; set; } = string.Empty;
+        public string MedicalPhysicalEvaluations { get; set; } = string.Empty;
 
-        // 29 was used for SecurityPublicRecord, now empty
+        [ProtoMember(29)]
+        public string MedicalPsychEvaluations { get; set; } = string.Empty;
 
         [ProtoMember(30)]
         public string SecurityRecords { get; set; } = string.Empty;
diff --git a/CharacterRecordsGenerator/RecordEditor.xaml b/CharacterRecordsGenerator/RecordEditor.xaml
index 417bd6c..d306ea5 100644
--- a/CharacterRecordsGenerator/RecordEditor.xaml
+++ b/CharacterRecordsGenerator/RecordEditor.xaml
@@ -1,4 +1,4 @@
-<controls:MetroWindow x:Class="CharacterRecordsGenerator.RecordEditor"
+<controls:MetroWindow x:Class="CharacterRecordsGenerator.RecordEditor"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -8,6 +8,9 @@
                       xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
                       mc:Ignorable="d"
                       Title="Character Records Generator" Height="697" Width="719.583"
+                      ShowIconOnTitleBar="True"
+                      ShowTitleBar="True"
+                      Icon="CRG.ico"
                       GlowBrush="{DynamicResource AccentColorBrush}"
                       TitleCharacterCasing="Normal" Loaded="WindowLoaded">
     <controls:MetroWindow.Resources>
@@ -227,23 +230,30 @@
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
                         <GridSplitter Grid.Row="2" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Employment History"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
-                                 controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True" Grid.Row="0"
-                                 ToolTip="Previous jobs that the character has worked. One per line.&#x0a;No need to put hyphens/bulletpoints; they'll be added automatically.&#x0a;&#x0a;e.g.&#x0a;Police Cadet, Mendell City [2450 - 2454]&#x0a;Police Officer, Mendell City [2454 - Ongoing]"
-                                 d:LayoutOverrides="VerticalAlignment" Text="{Binding Path=EmploymentExperience}" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" Grid.Row="1"
-                                 controls:TextBoxHelper.Watermark="Formal Education / Qualifications"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
-                                 controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
-                                 ToolTip="Formal education completed / qualifications acquired. One per-line.&#x0a;No need for bulletpoints; they'll be added automatically.&#x0a;&#x0a;e.g.&#x0a;Manual handling certificate [2450]&#x0a;PhD in Psychology [2460]"
-                                 Text="{Binding Path=EmploymentFormalEducation}" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
+                        <TextBlock Grid.Row="0" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Employment History"/>
+                        <TextBlock Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Formal Education / Qualifications"/>
+                        <TextBlock Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Other Skills"/>
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
                                  TextWrapping="Wrap"
-                                 controls:TextBoxHelper.Watermark="Other Skills / Ongoing Training" Grid.Row="2"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
+                                 controls:TextBoxHelper.Watermark="e.g.&#x0a;[2450-2454] Police Cadet, Mendell City&#x0a;[2454-2460] Police Officer, Mendell City&#x0a;[2464-Ongoing] Security Officer, Nanotrasen"
+                                 VerticalScrollBarVisibility="Auto"
+                                 controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True" Grid.Row="0"
+                                 ToolTip="Previous jobs that the character has worked. One per line.&#x0a;No need to put hyphens/bulletpoints; they'll be added automatically.&#x0a;&#x0a;e.g.&#x0a;[2450 - 2454] Police Cadet, Mendell City&#x0a;[2454 - Ongoing] Police Officer, Mendell City"
+                                 d:LayoutOverrides="VerticalAlignment" Text="{Binding Path=EmploymentExperience}" />
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" Grid.Row="1"
+                                 controls:TextBoxHelper.Watermark="e.g.&#x0a;[2452] Manual handling certificate&#x0a;[2460] PhD in Psychology"
+                                 VerticalScrollBarVisibility="Auto"
+                                 controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
+                                 ToolTip="Formal education completed / qualifications acquired. One per-line.&#x0a;No need for bulletpoints; they'll be added automatically.&#x0a;&#x0a;e.g.&#x0a;[2452] Manual handling certificate&#x0a;[2460] PhD in Psychology"
+                                 Text="{Binding Path=EmploymentFormalEducation}" />
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap"
+                                 controls:TextBoxHelper.Watermark="e.g.&#x0a;Currently a culinary student, set to graduate in 2465.&#x0a;First Aid trained" Grid.Row="2"
+                                 VerticalScrollBarVisibility="Auto"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  Text="{Binding Path=EmploymentSkills}"
                                  ToolTip="Any other skills of note, or training being undertaken currently.&#x0a;&#x0a;e.g.&#x0a;First Aid training&#x0a;Chemistry student at Mendell University" />
@@ -254,6 +264,10 @@
             <TabItem Header="Medical">
                 <ScrollViewer>
                     <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="92*"/>
+                            <ColumnDefinition Width="587*"/>
+                        </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="50" />
                             <!-- Checkboxes -->
@@ -263,10 +277,12 @@
                             <RowDefinition Height="122" MinHeight="60" />
                             <RowDefinition Height="122" MinHeight="60" />
                             <RowDefinition Height="122" MinHeight="60" />
+                            <RowDefinition Height="122" MinHeight="60" />
+                            <RowDefinition Height="122" MinHeight="60" />
                             <RowDefinition Height="0" />
                         </Grid.RowDefinitions>
                         <!-- Opt-Outs -->
-                        <Grid Grid.Row="0" ToolTip="If the character should not be borged.">
+                        <Grid Grid.Row="0" ToolTip="If the character should not be borged." Grid.ColumnSpan="2">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="163*"/>
                                 <ColumnDefinition Width="163*"/>
@@ -276,63 +292,90 @@
                             </Grid.ColumnDefinitions>
                             <CheckBox x:Name="NoBorg" Content="Do Not Borgify"
                                       HorizontalAlignment="Left"
-                                      Margin="0,10,0,0"
+                                      Margin="0,26,0,0"
                                       ToolTip="If the character should not be borged." TabIndex="1" Grid.Column="0" />
                             <CheckBox x:Name="NoRevive" Content="Do Not Resuscitate"
                                       HorizontalAlignment="Left"
-                                       Margin="-10,10,0,0" 
+                                       Margin="-10,26,0,0" 
                                       ToolTip="If the character should not be revived." TabIndex="2" Grid.Column="1" />
                             <CheckBox x:Name="NoProsthetic" Content="No Prosthetics"
                                       HorizontalAlignment="Left"
-                                      Margin="0,10,0,0"
+                                      Margin="0,26,0,0"
                                       ToolTip="If the character should not be fitted with prosthetics." TabIndex="3" Grid.Column="2" />
                         </Grid>
                         <!-- user-resizable stuff is fun! Not. -->
-                        <GridSplitter Grid.Row="1" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
+                        <GridSplitter Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Height="10" />
-                        <GridSplitter Grid.Row="2" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
+                        <GridSplitter Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
-                        <GridSplitter Grid.Row="3" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
+                        <GridSplitter Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
-                        <GridSplitter Grid.Row="4" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
+                        <GridSplitter Grid.Row="4" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
-                        <GridSplitter Grid.Row="5" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
+                        <GridSplitter Grid.Row="5" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
-                        <TextBox Margin="0,10" AcceptsReturn="True" TextWrapping="Wrap"
-                                 controls:TextBoxHelper.Watermark="Medical History"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True"
+                        <GridSplitter Grid.Row="6" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Bottom" Margin="0" Height="10" />
+                        <GridSplitter Grid.Row="7" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Bottom" Margin="0" Height="10" />
+                        <TextBlock Grid.Row="0" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Opt-outs"/>
+                        <TextBlock Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Allergies"/>
+                        <TextBlock Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Current Medications/Prescriptions"/>
+                        <TextBlock Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Medication History"/>
+                        <TextBlock Grid.Row="4" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Surgical History"/>
+                        <TextBlock Grid.Row="5" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Physical Evaluations"/>
+                        <TextBlock Grid.Row="6" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Documented Psychological Disorders"/>
+                        <TextBlock Grid.Row="7" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Psychological Evaluations"/>
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True" TextWrapping="Wrap"
+                                 controls:TextBoxHelper.Watermark="e.g.&#x0a;Peanuts (severe)&#x0a;Latex (minor irritation)"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  VerticalScrollBarVisibility="Auto"
-                                 ToolTip="Dated list of operations, surgeries, checkups of note, etc. One per line."
-                                 Grid.Row="1" Text="{Binding Path=MedicalHistory}" TabIndex="6" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True" TextWrapping="Wrap"
-                                 controls:TextBoxHelper.Watermark="Medical Notes - prescriptions, allergies, etc."
-                                 controls:TextBoxHelper.UseFloatingWatermark="True"
+                                 ToolTip="List of allergies. One per line."
+                                 Grid.Row="1" Text="{Binding Path=MedicalAllergies}" TabIndex="6" Grid.ColumnSpan="2" />
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True" TextWrapping="Wrap"
+                                 controls:TextBoxHelper.Watermark="e.g.&#x0a;2x 5u Perconol (daily) for back pain."
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  VerticalScrollBarVisibility="Auto"
-                                 ToolTip="Current prescriptions, allergies, etc. One per line." Grid.Row="2"
-                                 Text="{Binding Path=MedicalNotes}" TabIndex="7" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Psychiatric History"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True"
+                                 ToolTip="Current prescriptions, etc. One per line." Grid.Row="2"
+                                 Text="{Binding Path=MedicalCurrentPrescriptions}" TabIndex="7" Grid.ColumnSpan="2" />
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;[12/07/2462 - 12/08/2462] 5u Hyperzine (daily) for heart injury.&#x0a;[14/09/2463 - 16/09/2463] 30u Nightlife (daily) prescribed for a weekend party."
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  VerticalScrollBarVisibility="Auto"
-                                 ToolTip="Dated records of psych evals and other psychological events." Grid.Row="3"
-                                 Text="{Binding Path=MedicalPsychHistory}" TabIndex="8" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Psychiatric Notes"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True"
+                                 ToolTip="Dated records of medical history. One per line." Grid.Row="3"
+                                 Text="{Binding Path=MedicalHistory}" TabIndex="8" Grid.ColumnSpan="2" />
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;[09/04/2460] Triple coronary artery bypass"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  VerticalScrollBarVisibility="Auto"
-                                 ToolTip="Notes about mental/psychiatric health. One per line." Grid.Row="4"
-                                 Text="{Binding Path=MedicalPsychNotes}" TabIndex="9" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Prescriptions"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True"
+                                 ToolTip="Dated records of surgical history. One per line." Grid.Row="4"
+                                 Text="{Binding Path=MedicalSurgicalHistory}" TabIndex="9" Grid.ColumnSpan="2" />
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;[30/03/2458] Passed - Fully able for work.&#x0a;[29/03/2459] Passed - Fully able for work."
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  VerticalScrollBarVisibility="Auto"
-                                 ToolTip="Notes regarding assigned prescriptions. One per line." Grid.Row="5"
-                                 Text="{Binding Path=MedicalPrescriptions}" TabIndex="10" />
+                                 ToolTip="Dated records of physical evaluations. One per line." Grid.Row="5"
+                                 Text="{Binding Path=MedicalPhysicalEvaluations}" TabIndex="10" Grid.ColumnSpan="2" />
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;Obsessive-compulsive disorder"
+                                 controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
+                                 VerticalScrollBarVisibility="Auto"
+                                 ToolTip="Any documented psychological disorders. One per line." Grid.Row="6"
+                                 Text="{Binding Path=MedicalPsychDisorders}" TabIndex="10" Grid.ColumnSpan="2" />
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;[04/02/2459] Passed - John Doe is an example of excellent mental health."
+                                 controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
+                                 VerticalScrollBarVisibility="Auto"
+                                 ToolTip="Dated records of psychological evaluations. One per line." Grid.Row="7"
+                                 Text="{Binding Path=MedicalPsychEvaluations}" TabIndex="10" Grid.ColumnSpan="2" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
@@ -351,15 +394,19 @@
                                 <ColumnDefinition Width="1*"/>
                                 <ColumnDefinition Width="1*"/>
                             </Grid.ColumnDefinitions>
-                            <TextBox Grid.Column="0" Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Attitude Towards the SCC"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
+                            <TextBlock Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Attitude Towards the SCC"/>
+                            <TextBlock Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Attitude Towards the Crew"/>
+                            <TextBox Grid.Column="0" Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;John Doe displays a positive attitude towards the corporation."
+                                 VerticalScrollBarVisibility="Auto"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  ToolTip="A brief summary of the character's perceived attitude towards the conglomerate."
                                  Text="{Binding Path=SecurityAttitudeScc}" />
-                            <TextBox Grid.Column="1" Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Attitude Towards the Crew"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
+                            <TextBox Grid.Column="1" Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;John Doe is generally supportive of the rest of the crew. He is rarely involved in disputes."
+                                 VerticalScrollBarVisibility="Auto"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  ToolTip="A brief summary of the character's perceived attitude towards the rest of the crew."
                                  Text="{Binding Path=SecurityAttitudeCrew}" />
@@ -371,15 +418,19 @@
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
                         <GridSplitter Grid.Row="2" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Arrest History"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
+                        <TextBlock Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Arrest History"/>
+                        <TextBlock Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" FontWeight="DemiBold"
+                                      VerticalAlignment="Top" Margin="5,5,5,0" Text="Other Notes"/>
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;[23/04/2464] Battery - Some additional notes"
+                                 VerticalScrollBarVisibility="Auto"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  ToolTip="List of charges, dated if possible. One per line." Grid.Row="1"
                                  Text="{Binding Path=SecurityRecords}" />
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
-                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Other notes"
-                                 controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
+                        <TextBox Margin="0,21,0,10" AcceptsReturn="True"
+                                 TextWrapping="Wrap" controls:TextBoxHelper.Watermark="e.g.&#x0a;Whilst John Doe's record is clean, they're known to have unsavoury associates outside of work."
+                                 VerticalScrollBarVisibility="Auto"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
                                  ToolTip="Any things security should keep in mind when dealing with you. One per line."
                                  Grid.Row="2" Text="{Binding Path=SecurityNotes}" />
diff --git a/CharacterRecordsGenerator/RecordFormatter.cs b/CharacterRecordsGenerator/RecordFormatter.cs
index 99fa08a..f1f0060 100644
--- a/CharacterRecordsGenerator/RecordFormatter.cs
+++ b/CharacterRecordsGenerator/RecordFormatter.cs
@@ -17,11 +17,13 @@ namespace CharacterRecordsGenerator
 
         private IList<string> _publicNotes;
 
-        private IList<string> _medicalHistory;
-        private IList<string> _medicalNotes;
-        private IList<string> _medicalPsychHistory;
-        private IList<string> _medicalPsychNotes;
-        private IList<string> _medicalPrescriptions;
+        private IList<string> _MedicalAllergies;
+        private IList<string> _MedicalCurrentPrescriptions;
+        private IList<string> _MedicalHistory;
+        private IList<string> _MedicalSurgicalHistory;
+        private IList<string> _MedicalPhysicalEvaluations;
+        private IList<string> _MedicalPsychDisorders;
+        private IList<string> _MedicalPsychEvaluations;
 
         private IList<string> _securityRecords;
         private IList<string> _securityNotes;
@@ -41,11 +43,13 @@ namespace CharacterRecordsGenerator
             _publicNotes = _targetRecord.PublicNotes?.LineSplit();
 
             // Medical
-            _medicalHistory = _targetRecord.MedicalHistory?.LineSplit();
-            _medicalNotes = _targetRecord.MedicalNotes?.LineSplit();
-            _medicalPsychHistory = _targetRecord.MedicalPsychHistory?.LineSplit();
-            _medicalPsychNotes = _targetRecord.MedicalPsychNotes?.LineSplit();
-            _medicalPrescriptions = _targetRecord.MedicalPrescriptions?.LineSplit();
+            _MedicalAllergies = _targetRecord.MedicalAllergies?.LineSplit();
+            _MedicalCurrentPrescriptions = _targetRecord.MedicalCurrentPrescriptions?.LineSplit();
+            _MedicalHistory = _targetRecord.MedicalHistory?.LineSplit();
+            _MedicalSurgicalHistory = _targetRecord.MedicalSurgicalHistory?.LineSplit();
+            _MedicalPhysicalEvaluations = _targetRecord.MedicalPhysicalEvaluations?.LineSplit();
+            _MedicalPsychDisorders = _targetRecord.MedicalPsychDisorders?.LineSplit();
+            _MedicalPsychEvaluations = _targetRecord.MedicalPsychEvaluations?.LineSplit();
 
             // security
             _securityRecords = _targetRecord.SecurityRecords?.LineSplit();
diff --git a/CharacterRecordsGenerator/RecordFormatterGenerationMethods.cs b/CharacterRecordsGenerator/RecordFormatterGenerationMethods.cs
index 63c5837..44dc3ec 100644
--- a/CharacterRecordsGenerator/RecordFormatterGenerationMethods.cs
+++ b/CharacterRecordsGenerator/RecordFormatterGenerationMethods.cs
@@ -139,11 +139,13 @@ namespace CharacterRecordsGenerator
             recordText.Append(_commonRecords);
 
             // TODO: make this less horrible
-            if (!_medicalHistory.Any() &&
-                !_medicalNotes.Any() &&
-                !_medicalPsychHistory.Any() &&
-                !_medicalPsychNotes.Any() &&
-                !_medicalPrescriptions.Any() &&
+            if (!_MedicalAllergies.Any() &&
+                !_MedicalCurrentPrescriptions.Any() &&
+                !_MedicalHistory.Any() &&
+                !_MedicalSurgicalHistory.Any() &&
+                !_MedicalPhysicalEvaluations.Any() &&
+                !_MedicalPsychEvaluations.Any() &&
+                !_MedicalPsychDisorders.Any() &&
                 !_targetRecord.NoBorg &&
                 !_targetRecord.NoProsthetic &&
                 !_targetRecord.NoRevive)
@@ -154,11 +156,9 @@ namespace CharacterRecordsGenerator
             else
             {
                 recordText.AppendLine("/// MEDICAL RECORD ///");
+                recordText.AppendLine("The following information is protected by doctor-patient confidentiality laws. Do not release without patient's consent.");
                 recordText.AppendLine();
 
-                recordText.AppendLine(
-                    "The following information is protected by doctor-patient confidentiality laws. Do not release without patient's consent.\n");
-
                 if (_targetRecord.NoBorg || _targetRecord.NoProsthetic || _targetRecord.NoRevive)
                 {
                     recordText.AppendLine("IMPORTANT NOTES:");
@@ -176,26 +176,34 @@ namespace CharacterRecordsGenerator
                 }
 
                 WriteSectionIfAny(ref recordText,
-                    "Notes:",
-                    _medicalNotes);
+                    "Current Prescriptions:",
+                    _MedicalCurrentPrescriptions);
 
                 WriteSectionIfAny(ref recordText,
-                    "Medical History:",
-                    _medicalHistory);
+                    "Allergies:",
+                    _MedicalAllergies);
 
                 WriteSectionIfAny(ref recordText,
-                    "Psychiatric Notes:",
-                    _medicalPsychNotes);
+                    "Surgical History:",
+                    _MedicalSurgicalHistory);
 
                 WriteSectionIfAny(ref recordText,
-                    "Psychiatric History:",
-                    _medicalPsychHistory);
+                    "Medication History:",
+                    _MedicalHistory);
 
                 WriteSectionIfAny(ref recordText,
-                    "Prescriptions:",
-                    _medicalPrescriptions);
+                    "Physical Evaluations:",
+                    _MedicalPhysicalEvaluations);
+                               
+                WriteSectionIfAny(ref recordText,
+                    "Documented Psychological Disorders:",
+                    _MedicalPsychDisorders);
+
+                WriteSectionIfAny(ref recordText,
+                    "Psychological Evaluations:",
+                    _MedicalPsychEvaluations);
+
 
-                
             }
             recordText.AppendLine($"LAST UPDATED: {Utility.HumanisedDate(Info.IcDate)}");
             return recordText.ToString();
@@ -220,6 +228,7 @@ namespace CharacterRecordsGenerator
             else
             {
                 recordText.AppendLine("/// SECURITY RECORD ///");
+                recordText.AppendLine("This information has been verified by employment agents within the External Affairs department, and any comments, questions, or concerns about the legitimacy of such must be sent in a secure document to the same department.");
                 recordText.AppendLine();
 
                 WriteSectionIfAny(ref recordText,
diff --git a/CharacterRecordsGenerator/packages.config b/CharacterRecordsGenerator/packages.config
index 902ba08..12426b9 100644
--- a/CharacterRecordsGenerator/packages.config
+++ b/CharacterRecordsGenerator/packages.config
@@ -30,7 +30,7 @@
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net452" />
   <package id="System.Text.Encoding" version="4.3.0" targetFramework="net452" />
   <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net452" />
-  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net452" />
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net452" />
   <package id="System.Threading" version="4.3.0" targetFramework="net452" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net452" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net452" />
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e4409ee
--- /dev/null
+++ b/README.md
@@ -0,0 +1,7 @@
+# Character Records Generator (for Aurora)
+
+A tool for making setting up employment, medical, and security records a little easier on Aurora, forked from the AuroraRecordGenerator originally created by Lohikar.
+
+This modification of the records generator has been made up to date with all of the latest changes to the server, and to better match the example records present on [Aurora's Guide to Character Records](https://wiki.aurorastation.org/index.php?title=Guide_to_Character_Records). Some redundant fields have been removed, and nearly all of the fields are now optional rather than being listed as 'not specified', hopefully to make filling out the records less of a chore if you want to do it piece by piece as you play.
+
+Credit to Lohikar's original AuroraRecordGenerator (https://github.com/Lohikar/AuroraRecordGenerator)