diff --git a/fedireads/federation.py b/fedireads/federation.py
index 77a7ac27f..45a352964 100644
--- a/fedireads/federation.py
+++ b/fedireads/federation.py
@@ -191,16 +191,18 @@ def handle_outgoing_follow(user, to_follow):
 
 def handle_response(response):
     ''' hopefully it's an accept from our follow request '''
-    activity = response.json()
-    if not activity:
+    try:
+        activity = response.json()
+    except ValueError:
         return
     if activity['type'] == 'Accept':
         handle_incoming_accept(activity)
 
 def handle_incoming_accept(activity):
     ''' someone is accepting a follow request '''
-    # remote user who said yes
+    # not actually a remote user so this is kinda janky
     user = get_or_create_remote_user(activity['actor'])
+    # the person our local user wants to follow, who said yes
     followed = models.User.objects.get(actor=activity['object']['actor'])
     followed.followers.add(user)
     models.FollowActivity(
diff --git a/fedireads/templates/book.html b/fedireads/templates/book.html
index aabe0730d..35fc512dc 100644
--- a/fedireads/templates/book.html
+++ b/fedireads/templates/book.html
@@ -17,6 +17,9 @@
 
     <div class="reviews">
         <h2>Reviews</h2>
+        {% if not reviews %}
+        <p>No reviews yet!</p>
+        {% endif %}
         {% for review in reviews %}
         <p><span class="review-title">{{ review.name }}</span>{{ review.rating }} stars, by {{ review.user.username }}</p>
         <p>{{ review.review_content }}</p>
diff --git a/fedireads/templates/feed.html b/fedireads/templates/feed.html
index 9c7b56915..55460b8a4 100644
--- a/fedireads/templates/feed.html
+++ b/fedireads/templates/feed.html
@@ -26,7 +26,7 @@
             </p>
             <p>by <a href="" class="author">{{ book.authors.first.data.name }}</a></p>
             {% if not book.user_shelves %}
-            <form name="shelve" action="/shelve/{{ request.user.username }}_to-read/{{ book.id }}" method="post">
+            <form name="shelve" action="/shelve/{{ request.user.localname }}_to-read/{{ book.id }}" method="post">
                 <input type="hidden" name="book" value="book.id"></input>
                 <input type="submit" value="want to read"></input>
             </form>
@@ -38,7 +38,9 @@
     <div class="update">
         <div class="user-preview">
             <img class="user-pic" src="static/images/profile.jpg">
-            <span><a href="" class="user">Mouse</a> did {{ activity.activity_type }} </span>
+            <span><a href="/user/{% if activity.user.localname %}{{ activity.user.localname }}{% else %}{{ activity.user.username }}{% endif %}" class="user">
+                    {% if activity.user.localname %}{{ activity.user.localname }}{% else %}{{ activity.user.username }}{% endif %}</a>
+                did {{ activity.activity_type }} </span>
         </div>
     </div>
     {% endfor %}