diff --git a/fedireads/api.py b/fedireads/api.py
index 6d10479c3..3a70137d2 100644
--- a/fedireads/api.py
+++ b/fedireads/api.py
@@ -19,11 +19,15 @@ def get_or_create_remote_user(actor):
     except models.User.DoesNotExist:
         pass
 
+    # TODO: also bring in the user's prevous reviews and books
+
     # load the user's info from the actor url
     response = requests.get(
         actor,
         headers={'Accept': 'application/activity+json'}
     )
+    if not response.ok:
+        response.raise_for_status()
     data = response.json()
 
     # the webfinger format for the username.
diff --git a/fedireads/incoming.py b/fedireads/incoming.py
index 7307b66d7..b212957d8 100644
--- a/fedireads/incoming.py
+++ b/fedireads/incoming.py
@@ -16,6 +16,7 @@ from fedireads.openlibrary import get_or_create_book
 from fedireads.settings import DOMAIN
 
 
+# TODO: this should probably live somewhere else
 class HttpResponseUnauthorized(HttpResponse):
     ''' http response for authentication failure '''
     status_code = 401
diff --git a/fedireads/views.py b/fedireads/views.py
index f64ae28f8..ad3ea602e 100644
--- a/fedireads/views.py
+++ b/fedireads/views.py
@@ -1,7 +1,7 @@
 ''' application views/pages '''
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required
-from django.db.models import Avg, FilteredRelation, Q
+from django.db.models import Avg, Q
 from django.http import HttpResponseNotFound
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
@@ -14,6 +14,7 @@ from fedireads.settings import DOMAIN
 @login_required
 def home(request):
     ''' user's homepage with activity feed '''
+    # user's shelves for display
     reading = models.Shelf.objects.get(
         user=request.user,
         shelf_type='reading'
@@ -22,15 +23,19 @@ def home(request):
         user=request.user,
         shelf_type='to-read'
     )
+
+    # allows us to check if a user has shelved a book
     user_books = models.Book.objects.filter(shelves__user=request.user).all()
+
+    # books new to the instance, for discovery
     recent_books = models.Book.objects.order_by(
         '-added_date'
     )[:5]
 
+    # status updates for your follow network
     following = models.User.objects.filter(
         Q(followers=request.user) | Q(id=request.user.id)
     )
-
     # TODO: handle post privacy
     activities = models.Activity.objects.filter(
         user__in=following,
@@ -46,7 +51,7 @@ def home(request):
         'recent_books': recent_books,
         'user_books': user_books,
         'activities': activities,
-        'login_form': login_form,
+        'login_form': login_form, # TODO remove this
     }
     return TemplateResponse(request, 'feed.html', data)
 
@@ -61,6 +66,7 @@ def user_login(request):
     # authenticate user
     form = forms.LoginForm(request.POST)
     if not form.is_valid():
+        # TODO messaging about a login failure
         return TemplateResponse(request, 'login.html')
 
     username = form.data['username']
@@ -106,6 +112,7 @@ def register(request):
 def user_profile(request, username):
     ''' profile page for a user '''
     content = request.headers.get('Accept')
+    # TODO: this should probably be the full content type? maybe?
     if 'json' in content:
         # we have a json request
         return incoming.get_actor(request, username)
@@ -119,8 +126,10 @@ def user_profile(request, username):
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
+    # TODO: change display with privacy and authentication considerations
     shelves = models.Shelf.objects.filter(user=user)
-    ratings = {r.book.id: r.rating for r in models.Review.objects.filter(user=user, book__shelves__user=user)}
+    ratings = {r.book.id: r.rating for r in \
+            models.Review.objects.filter(user=user, book__shelves__user=user)}
 
     data = {
         'user': user,
@@ -147,6 +156,7 @@ def user_profile_edit(request, username):
     return TemplateResponse(request, 'edit_user.html', data)
 
 
+# TODO: there oughta be clear naming between endpoints and pages
 @login_required
 def edit_profile(request):
     ''' les get fancy with images '''
@@ -169,6 +179,7 @@ def edit_profile(request):
 def book_page(request, book_identifier):
     ''' info about a book '''
     book = openlibrary.get_or_create_book('/work/' + book_identifier)
+    # TODO: again, post privacy?
     reviews = models.Review.objects.filter(book=book)
     rating = reviews.aggregate(Avg('rating'))
     review_form = forms.ReviewForm()