clean up some comments, and add a couple more helper fields for typeahead use