diff --git a/client/main.php b/client/main.php
index b99fddb..b416a86 100644
--- a/client/main.php
+++ b/client/main.php
@@ -1,7 +1,8 @@
 <?php
-	// Float pinned posts to the top.
-	// If they share a pinned/unpinned status, later post comes to the top.
-	// Otherwise, force pinned post to the top.
+	// Sort the threads array so that pinned posts float to the top.
+	// If the threads share a pinned status (both pinned or both not),
+	// then the thread with the later creation time floats to the top.
+	// Otherwise, the pinned thread is forced to the top.
 	function pinned_sort($thread_a,$thread_b) {
 		if ($thread_a["pinned"] == $thread_b["pinned"]) {
 			return (($thread_a["last_mod"]>$thread_b["last_mod"])? -1 : 1);
diff --git a/client/thread.php b/client/thread.php
index 091fccf..22270f6 100644
--- a/client/thread.php
+++ b/client/thread.php
@@ -1,4 +1,13 @@
 <?php
+	function lookup($match) {
+		$data = $thread["data"];
+		$usermap = $thread["usermap"];
+		$postnum = $match[1];
+		if ($postnum==0) {
+			return ">>OP";
+		}
+		return ">>".$postnum.$usermap[$data["messages"][$postnum]["author"]]["user_name"];
+	}
 	foreach($thread["data"]["messages"] as $message) {
 		$username = $thread["usermap"][$message["author"]]["user_name"];
 		$time = round($message['created']);
@@ -7,7 +16,8 @@
 		echo "\t\t<div class='well' id='post{$message["post_id"]}'>".PHP_EOL;
 		echo "\t\t\t<p>&gt;{$message['post_id']} {$username} @ {$time}</p>".PHP_EOL;
 		echo "\t\t\t<pre>";
-		echo str_replace(">>0",">>OP",$message["body"]).PHP_EOL;
+//		echo str_replace(">>0",">>OP",$message["body"]).PHP_EOL;
+		echo preg_replace_callback("/>>(\d+)/",'lookup',$message["body"]).PHP_EOL;
 		echo "</pre>".PHP_EOL;
 		echo "\t\t</div>".PHP_EOL;
 	}