I made changes based on my interpretation of these comments.  Please let me know if they look OK to you.