Addressed second batch of comments.