Updates based on Slava's comments

Updates for Slava's comments, and integrating the updates from the IB since the original PR was made.