updates to fix some of the pr comments.