diff --git a/src/App.jsx b/src/App.jsx
index ad4dfe1..e1430d0 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -141,6 +141,13 @@ function App() {
 						</a>{" "}
 						website.
 					</div>
+					<div style={{ fontSize: "1.2rem" }}>
+						FancyScribe is an open-source project and can be found on Github (
+						<a href="https://github.com/NilsUeter/fancyscribe" target="_blank">
+							FancyScribe
+						</a>
+						) .
+					</div>
 					<div style={{ padding: "8px 0", fontSize: "1.7rem" }}>
 						Output Examples
 					</div>
diff --git a/src/Roster.jsx b/src/Roster.jsx
index 07f7377..da67fa2 100644
--- a/src/Roster.jsx
+++ b/src/Roster.jsx
@@ -326,9 +326,21 @@ const ModelStats = ({ modelStats, index, showName, modelList }) => {
 	if (!wounds) {
 		wounds = "/";
 	}
-	const modelListMatches = modelList
-		.filter((model) => model.includes(name))
-		.map((model) => "(" + model.split("(")[1]);
+	if (!name.includes("Sgt")) {
+		modelList = modelList.filter((model) => !model.includes("Sgt"));
+	}
+	if (!name.includes("Sergeant")) {
+		modelList = modelList.filter((model) => !model.includes("Sergeant"));
+	}
+	let modelListMatches = modelList.filter((model) =>
+		model.includes(name + " w")
+	);
+	if (modelListMatches.length === 0) {
+		modelListMatches = modelList.filter((model) => model.includes(name));
+	}
+	modelListMatches = modelListMatches.map((model) =>
+		model.replaceAll(name, "")
+	);
 	return (
 		<div style={{ display: "flex", gap: 16, alignItems: "center" }}>
 			<Characteristic title="M" characteristic={move} index={index} />
@@ -365,7 +377,6 @@ const ModelStats = ({ modelStats, index, showName, modelList }) => {
 };
 
 const FactionIcon = ({ catalog }) => {
-	console.log(catalog);
 	return (
 		<div
 			style={{