Minor UI edits.  Fleshed out error handling and comments.