diff --git a/sanityCheck b/sanityCheck
index e8e842b19766a9b04452b30f317e5af78755a42f..98ca937510f9fc43700befb58eee0cfa16204515 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -99,6 +99,8 @@ $GREP -e "<<option " --and --not -e "<<option  *\(-\?[0-9]\+\|[\'\"].*[\'\"]\|fa
 # check for missing ; before statement
 $GREP 'if $ ' -- 'src/*'  | myprint "missing ; before statement"
 $GREP 'elseif $ ' -- 'src/*'  | myprint "missing ; before statement"
+# Check for an unrecognized letter before >>
+$GREP "[^]a-zA-Z0-9 \")}'+-\*\`] *>>" -- 'src/*' | myprint "StrangeCharacterAtEndOfCommand"
 # Check for a . inside a <<>>
 $GREP "<<[a-zA-Z]\([^\"'>]\|[^\"'>]>[^\"'>]\)*[a-zA-Z][.][^a-zA-Z]" | myprint "StrangeCharacterAfterDot"
 # Check for @@. instead of .@@
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 8b371369cf73fe48375b9a6c965a6b6929259857..5690b39a8c48071bf43d058ba94e0c7344383c86 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1159,6 +1159,8 @@ __''Player Character''__
 <</options>>
 <br>
 
+<<set _exampleSlave = BaseSlave()>>
+
 <<if $seeImages == 1>>
 	<<options $imageChoice>>
 		Using
@@ -1174,6 +1176,10 @@ __''Player Character''__
 			<br>@@.red;Git compiled only, no exceptions.@@
 	<</options>>
 	<<if $imageChoice == 1>>
+		<br>
+		<div style="position:relative;width:200px;height:200px;margin:0 auto;">
+			<<SlaveArt _exampleSlave 0 0>>
+		</div>
 		<br>
 		<<options $seeFaces>>
 			Face art
@@ -1201,7 +1207,15 @@ __''Player Character''__
 			@@.cyan;ENABLED@@ on all images.
 		<</options>>
 	<<elseif $imageChoice == 2>>
+		<br>
+		<div style="position:relative;width:200px;height:200px;margin:0 auto;">
+			<<SlaveArt _exampleSlave 0 0>>
+		</div>
 	<<elseif $imageChoice == 3>>
+		<br>
+		<div style="position:relative;width:200px;height:200px;margin:0 auto;">
+			<<SlaveArt _exampleSlave 0 0>>
+		</div>
 		<br>
 		<<options $seeVectorArtHighlights>>
 			Highlights on shiny clothing
diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js
index 3e089e5815aaaf2e5a826bdbfec06d9de81d6e77..b4d81c6d548aecbba2d12f180509f62df7af8a56 100644
--- a/src/js/optionsMacro.js
+++ b/src/js/optionsMacro.js
@@ -31,12 +31,13 @@ Macro.add('options', {
 			var comment = null;
 			var hasMultipleOptionsWithSameValue = false;
 			var description = "";
+			var hasCurrentOption = this.payload[0].args.full &&
+			this.payload[0].args.full !== '""' && this.payload[0].args.full !== "''";
 
 			/* Check if we have a first argument - if we do, it should be a
 			   variable like $foo
 			  */
-			if (this.payload[0].args.full &&
-					this.payload[0].args.full !== '""' && this.payload[0].args.full !== "''") {
+			if (hasCurrentOption) {
 				if (currentOption === undefined)
 					currentOption = false;
 				if (this.payload[0].args.full.startsWith("State.temporary.")) {
@@ -95,6 +96,21 @@ Macro.add('options', {
 						throw new Error("Only valid tag is 'option' inside 'options'");
 					}
 				}
+			} else {
+				// No variable was passed to <<options>>
+				// This is valid, but then we only allow an empty <<option>> or <<comment>>
+				// inside
+				for (let i = 1, len = this.payload.length; i < len; ++i) {
+					if (this.payload[i].name === 'option' && this.payload[i].args.length === 0) {
+						// This is valid for an empty <<options>>
+					} else if (this.payload[i].name === "comment") {
+						// This is valid for an empty <<options>>
+					} else {
+						throw new Error("Missing variable to <<options>>");
+					}
+
+				}
+
 			}
 
 			var showSelectedOption = true; //this.payload.length !== 3 || !description;
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index bc2456aba20b55ccf0013dafca7decbf142bbb83..9cddae9ec3d3ff35ca8b433e4a792102b409ffdc 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -894,7 +894,7 @@ __You are customizing this slave:__
 	<</options>>
 
 	<br>
-	<<options >>
+	<<options $activeSlave.tastes>>
 		''Taste ability:''
 		<<option 0 "Normal">> Normal.
 		<<option -1 "None">> Unable to taste.
@@ -1192,7 +1192,7 @@ __You are customizing this slave:__
 			//Must have a vagina to have vaginal skills//
 	<</options>>
 <<else>>
-	<<options $activeSlave.vagina>>
+	<<options $activeSlave.vaginalSkill>>
 		''Vaginal sex:''
 		<<optionlte 10 0  "Unskilled">>Unskilled.
 		<<optionlte 30 15 "Basic">>@@.cyan;Basic.@@
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 3ebc6ef2d386beeaa971a5f3dbd83ba6b949a705..9e77734b1200cdcdca3e954ff67859c5820c5f60 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -395,7 +395,7 @@ Choose piercing style:
 		<<if $activeSlave.lipsPiercing != 1>><<set $activeSlave.lipsPiercing = 1>>				<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>><</if>>
 		<<if $activeSlave.tonguePiercing != 1>><<set $activeSlave.tonguePiercing = 1>>			<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>><</if>>
 		<<if $activeSlave.nipples != "fuckable">>
-			<<if $activeSlave.nipplesPiercing != 1 && >><<set $activeSlave.nipplesPiercing = 1>><<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>><</if>>
+			<<if $activeSlave.nipplesPiercing != 1>><<set $activeSlave.nipplesPiercing = 1>><<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>><</if>>
 		<</if>>
 		<<if $activeSlave.areolaePiercing != 1>><<set $activeSlave.areolaePiercing = 1>>		<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>><</if>>
 		<<if $activeSlave.corsetPiercing != 1>><<set $activeSlave.corsetPiercing = 1>>			<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>><</if>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 551513703c5d7df8906d4053eb0fbf7108c63ecd..c66e64ef586510f0092a2b552096c507da5d5c2d 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -458,7 +458,7 @@
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
 	<</if>>
 	<<if $slaves[$i].vasectomy == 1>>
-		<<set $slaves[$i].vasectomy = 0, $slaves[$i].health -= 10,>>
+		<<set $slaves[$i].vasectomy = 0, $slaves[$i].health -= 10>>
 		<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
 	<</if>>
 	<<if ($dairySlimMaintain == 0)>>