Adding comments and addressing comments.