Fix user indexing, add in some comments.