Please find attached updated patch which I think addresses all the points discussed.  Let me know if you see any further changes needed.

Thanks,
Rick