Fix typos and revise design based on things I ended up not needing.