Final modifications and comments.