first pass resolution of review comments
bug fixes from integration testing and address code review comments