Incorporating comments from code review
Adding some additional logging
Merging in dev/SE-207