Updates  comments.  Various bug fixes.