Addressed some review items.