Added some comments.  A few minor changes to the displayed messages.  That thing I thought was a bug was actually a feature.  (!)