diff --git a/gen.py b/gen.py
index 4961990..980e02b 100755
--- a/gen.py
+++ b/gen.py
@@ -14,22 +14,34 @@ args = parser.parse_args()
 
 if not args.simulate:
 	client = Mastodon(
-					client_id="clientcred.secret",
-					access_token="usercred.secret",
-					api_base_url="https://botsin.space")
+		client_id="clientcred.secret",
+		access_token="usercred.secret",
+		api_base_url="https://botsin.space"
+	)
 
 db = sqlite3.connect("dict.db")
 db.text_factory=str
 c = db.cursor()
-data = c.execute(r'SELECT word, definition FROM entries WHERE word LIKE "%ar%" AND wordtype LIKE "n."').fetchall()
+data = c.execute(r'SELECT word, definition FROM entries WHERE word LIKE "%ar%" AND wordtype LIKE "n." AND definition NOT LIKE "See%" AND definition NOT LIKE "Alt.%"').fetchall()
 dset = random.choice(data)
-toot = "What's a pirate's favourite {}?\nA {}!".format(
-	re.search(r"^([^.]+)", dset[1]).group(1).replace("\n  ", ""), dset[0].lower().replace("ar", "a" + ('r' * random.randint(3,10)))
+definition = dset[1].replace("\n  ", "") # remove newlines from definitions
+definition = definition.replace("etc.", "etc") # remove full stop from etc so as not to confuse the """algorithm"""
+definition = re.search(r"^(?:An?|The)? ?([^.]*)", definition).group(1) # remove leading "A", "An", and "The", and stop at the first full stop
+definition = definition[0].lower() + definition[1:] # make first letter lowercase
+if " " not in definition:
+	# "what's a pirate's favourite disembarkation? a debarrrkation!" doesn't make sense
+	# so replace single words with "alternate word for {word}"
+	# example: "what's a pirate's favourite alternate word for disembarkation? a debarrrkation!"
+	# not perfect but much better
+	definition = "alternative word for {}".format(definition)
+cw = "What's a pirate's favourite {}?".format(definition)
+toot = "A {}!".format(
+	dset[0].lower().replace("ar", "a" + ('r' * random.randint(3,10)))
 )
 
 if not args.simulate:
 	try:
-		client.status_post(toot, visibility = 'unlisted')
+		client.status_post(toot, visibility = 'unlisted', spoiler_text = cw)
 	except Exception as err:
 		toot = "Arr, @lynnesbian@fedi.lynnesbian.space, ye scallywag!" \
 		+ " I've encountered an error most dire!" \
@@ -37,4 +49,5 @@ if not args.simulate:
 		with open("error.log", "w") as f:
 			f.write("\n".join(traceback.format_tb(sys.exc_info()[2])))
 		client.status_post(toot, visibility = 'unlisted', spoiler_text = "Error!")
+print(cw)
 print(toot)