Added some comments.  Tweaked search and listing.