Addressed some reviewer comments.