diff --git a/src/d2m/actions/create-room.js b/src/d2m/actions/create-room.js
index 31d3022..c2ec01a 100644
--- a/src/d2m/actions/create-room.js
+++ b/src/d2m/actions/create-room.js
@@ -256,7 +256,7 @@ async function createRoom(channel, guild, spaceID, kstate, privacyLevel) {
 
 /**
  * Handling power levels separately. The spec doesn't specify what happens, Dendrite differs,
- * and Synapse does an absolutely insane *shallow merge* of what I provide on top of what it creates.
+ * and Synapse does a very poorly thought out *shallow merge* of what I provide on top of what it creates.
  * We don't want the `events` key to be overridden completely.
  * https://github.com/matrix-org/synapse/blob/develop/synapse/handlers/room.py#L1170-L1210
  * https://github.com/matrix-org/matrix-spec/issues/492
diff --git a/src/d2m/converters/message-to-event.test.embeds.js b/src/d2m/converters/message-to-event.test.embeds.js
index 73244d3..fdb0807 100644
--- a/src/d2m/converters/message-to-event.test.embeds.js
+++ b/src/d2m/converters/message-to-event.test.embeds.js
@@ -125,8 +125,8 @@ test("message2event embeds: blockquote in embed", async t => {
 	t.equal(called, 1, "should call getJoinedMembers once")
 })
 
-test("message2event embeds: crazy html is all escaped", async t => {
-	const events = await messageToEvent(data.message_with_embeds.escaping_crazy_html_tags, data.guild.general)
+test("message2event embeds: extreme html is all escaped", async t => {
+	const events = await messageToEvent(data.message_with_embeds.extreme_html_escaping, data.guild.general)
 	t.deepEqual(events, [{
 		$type: "m.room.message",
 		msgtype: "m.notice",
diff --git a/src/m2d/converters/event-to-message.js b/src/m2d/converters/event-to-message.js
index a49dd1c..2d45756 100644
--- a/src/m2d/converters/event-to-message.js
+++ b/src/m2d/converters/event-to-message.js
@@ -766,7 +766,7 @@ async function eventToMessage(event, guild, channel, di) {
 				// Generate a reply preview for a standard message
 				repliedToContent = repliedToContent.replace(/.*<\/mx-reply>/s, "") // Remove everything before replies, so just use the actual message body
 				repliedToContent = repliedToContent.replace(/^\s*<blockquote>.*?<\/blockquote>(.....)/s, "$1") // If the message starts with a blockquote, don't count it and use the message body afterwards
-				repliedToContent = repliedToContent.replace(/(?:\n|<br>)+/g, " ") // Should all be on one line
+				repliedToContent = repliedToContent.replace(/(?:\n|<br ?>)+/g, " ") // Should all be on one line
 				repliedToContent = repliedToContent.replace(/<span [^>]*data-mx-spoiler\b[^>]*>.*?<\/span>/g, "[spoiler]") // Good enough method of removing spoiler content. (I don't want to break out the HTML parser unless I have to.)
 				repliedToContent = repliedToContent.replace(/<img([^>]*)>/g, (_, att) => { // Convert Matrix emoji images into Discord emoji markdown
 					const mxcUrlMatch = att.match(/\bsrc="(mxc:\/\/[^"]+)"/)
diff --git a/src/m2d/converters/event-to-message.test.js b/src/m2d/converters/event-to-message.test.js
index b057b63..1c263b4 100644
--- a/src/m2d/converters/event-to-message.test.js
+++ b/src/m2d/converters/event-to-message.test.js
@@ -1943,9 +1943,9 @@ test("event2message: should suppress embeds for links in reply preview", async t
 			sender: "@rnl:cadence.moe",
 			content: {
 				msgtype: "m.text",
-				body: `> <@cadence:cadence.moe> https://www.youtube.com/watch?v=uX32idb1jMw\n\nEveryone in the comments is like "you're so ahead of the curve" and "crazy that this came out before the scandal" but I thought Mr Beast sucking was a common sentiment`,
+				body: `> <@cadence:cadence.moe> https://www.youtube.com/watch?v=uX32idb1jMw\n\nEveryone in the comments is like "you're so ahead of the curve" and "can't believe this came out before the scandal" but I thought Mr Beast sucking was a common sentiment`,
 				format: "org.matrix.custom.html",
-				formatted_body: `<mx-reply><blockquote><a href="https://matrix.to/#/!fGgIymcYWOqjbSRUdV:cadence.moe/$qmyjr-ISJtnOM5WTWLI0fT7uSlqRLgpyin2d2NCglCU?via=cadence.moe">In reply to</a> <a href="https://matrix.to/#/@cadence:cadence.moe">@cadence:cadence.moe</a><br>https://www.youtube.com/watch?v=uX32idb1jMw</blockquote></mx-reply>Everyone in the comments is like "you're so ahead of the curve" and "crazy that this came out before the scandal" but I thought Mr Beast sucking was a common sentiment`,
+				formatted_body: `<mx-reply><blockquote><a href="https://matrix.to/#/!fGgIymcYWOqjbSRUdV:cadence.moe/$qmyjr-ISJtnOM5WTWLI0fT7uSlqRLgpyin2d2NCglCU?via=cadence.moe">In reply to</a> <a href="https://matrix.to/#/@cadence:cadence.moe">@cadence:cadence.moe</a><br>https://www.youtube.com/watch?v=uX32idb1jMw</blockquote></mx-reply>Everyone in the comments is like "you're so ahead of the curve" and "can't believe this came out before the scandal" but I thought Mr Beast sucking was a common sentiment`,
 				"m.relates_to": {
 					"m.in_reply_to": {
 						event_id: "$qmyjr-ISJtnOM5WTWLI0fT7uSlqRLgpyin2d2NCglCU"
@@ -1975,7 +1975,7 @@ test("event2message: should suppress embeds for links in reply preview", async t
 				username: "RNL",
 				content: "-# > <:L1:1144820033948762203><:L2:1144820084079087647>https://discord.com/channels/112760669178241024/687028734322147344/1273204543739396116 **Ⓜcadence [they]**:"
 					+ " <https://www.youtube.com/watch?v=uX32idb1jMw>"
-					+ `\nEveryone in the comments is like "you're so ahead of the curve" and "crazy that this came out before the scandal" but I thought Mr Beast sucking was a common sentiment`,
+					+ `\nEveryone in the comments is like "you're so ahead of the curve" and "can't believe this came out before the scandal" but I thought Mr Beast sucking was a common sentiment`,
 				avatar_url: undefined,
 				allowed_mentions: {
 						parse: ["users", "roles"]
diff --git a/test/data.js b/test/data.js
index 46e8b0f..45e0388 100644
--- a/test/data.js
+++ b/test/data.js
@@ -4617,7 +4617,7 @@ module.exports = {
 			flags: 0,
 			components: []
 		},
-		escaping_crazy_html_tags: {
+		extreme_html_escaping: {
 			id: "1158894131322552391",
 			type: 0,
 			content: "",