bugs and reviewer comments.