Add comments.  Rename stuff.