Modified classes a little.  Improved comments.