3 files changed, 87 insertions, 42 deletions
diff --git a/RGens/data/sample-grammars/names.gram b/RGens/data/sample-grammars/names.gram
index b499d3d..2dd2e25 100644
--- a/RGens/data/sample-grammars/names.gram
+++ b/RGens/data/sample-grammars/names.gram
@@ -199,6 +199,7 @@ pragma export-rule [random-name]
 	comissioner
 	comptroller
 	courtier
+	courtier (to [full-name-and-title] )
 	curator
 	intendant
 	superindentent
@@ -208,7 +209,7 @@ pragma export-rule [random-name]
 	lord warden
 	apprentice
 	apprentice (to a [generic-title] )
-	apprentice (to a [full-name-and-title] )
+	apprentice (to [full-name-and-title] )
 	journeyman
 	adept
 	centurion
@@ -219,6 +220,7 @@ pragma export-rule [random-name]
 	pontiff
 	knight
 	squire
+	squire (to [full-name-and-title] )
 
 [military-title] admiral
 	grand admiral
diff --git a/RGens/data/sample-grammars/rtwiki/guns.gram b/RGens/data/sample-grammars/rtwiki/guns.gram
index 9b21827..2fc5d86 100644
--- a/RGens/data/sample-grammars/rtwiki/guns.gram
+++ b/RGens/data/sample-grammars/rtwiki/guns.gram
@@ -1,43 +1,11 @@
-[guncorp] Ace-Eight Industrial 
-	Akinyemi Firearms 
-	Anasi Manufacturing 
-	Atmaghata Group 
-	Brainfuck Limited 
-	Choral Hardtech Ventures 
-	Double Six Security 
-	Death's Head Enterprises 
-	Exomorph Technica 
-	Fury Sports 
-	Pactkeeper Copperhead
-	Bereitschaft GmbH 
-	Godfist Corporation 
-	Golovanov Amerika 
-	Ishtar Macrotech 
-	Jiandao Fangyu 
-	Hachiman Omnitech 
-	Hivewerks 
-	Honeybadger Sporting Arms 
-	Kaamat-Bandi 
-	Nadel Hauserkampf 
-	Neo-Ordinance 
-	Nekrasova Armaments 
-	Onwudiwe Group 
-	Pallas Athena Industries 
-	Pryhn Interstellar Arms 
-	Quliang 
-	Raventech 
-	Riverboat Weaponsmiths 
-	Sekhmet Industrial Warfare 
-	Skullkorp 
-	Southern Dwarfhold 
-	Takein Personal Weaponry 
-	Thorhammer Urban 
-	Ultraviolet Thunderbolt 
-	Waspmill Coounterstrike 
-	Xuguan-Fuchang 
-	Yttrium Galactic 
-	Zoahou Unlimited 
-	Zurgug Tribal Alliance 
+[guncorp] [guncorp-1]
+	[guncorp-1] [guncorp-2]
+	[guncorp-1] [guncorp-2]
+	[guncorp-1] [guncorp-2]
+	[guncorp-1] [guncorp-1] [guncorp-2]
+	[guncorp-1] - [guncorp-1] [guncorp-2]
+	[guncorp-1] and [guncorp-1] [guncorp-2]
+	[guncorp-1] / [guncorp-1] [guncorp-2]
 
 [gun-name] Chimera
 	Warrior
@@ -150,3 +118,79 @@
 
 pragma export-rule [guncorp]
 pragma export-rule [gun-name]
+
+[guncorp-1] Ace-Eight 
+	Akinyemi       
+	Anasi
+	Atmaghata
+	Brainfuck
+	Choral Hardtech
+	Double Six
+	Death's Head
+	Exomorph
+	Fury
+	Pactkeeper
+	Bereitschaft
+	Godfist
+	Golovanov
+	Ishtar
+	Jiandao
+	Hachiman
+	Hivewerks
+	Honeybadger
+	Kaamat-Bandi
+	Nadel
+	Neo-Ordinance
+	Nekrasova
+	Onwudiwe
+	Pallas Athena
+	Pryhn
+	Quliang
+	Raventech
+	Riverboat
+	Sekhmet
+	Skullkorp
+	Southern
+	Takein
+	Thorhammer
+	Ultraviolet
+	Waspmill
+	Xuguan-Fuchang
+	Yttrium
+	Zoahou
+	Zurgug
+
+[guncorp-2] Industrial
+	Firearms
+	Manufacturing
+	Group
+	Limited
+	Ventures
+	Security
+	Enterprises
+	Technica
+	Sports
+	Copperhead
+	GmbH
+	Corporation
+	Amerika
+	Macrotech
+	Fangyu
+	Omnitech
+	Sporting Arms
+	Hauserkampf
+	Armaments
+	Group
+	Industries
+	Interstellar Arms
+	Weaponsmiths
+	Industrial Warfare
+	Dwarfhold
+	Personal Weaponry
+	Urban
+	Thunderbolt
+	Coounterstrike
+	Galactic
+	Unlimited
+	Tribal Alliance
+
diff --git a/RGens/data/seniordesign/dbdata.gram b/RGens/data/seniordesign/dbdata.gram
index 687340f..e69de29 120000..100644
--- a/RGens/data/seniordesign/dbdata.gram
+++ b/RGens/data/seniordesign/dbdata.gram
@@ -1 +0,0 @@
-dbdata.gram
-\ No newline at end of file