> Thanks, could you please post an updated patch with all of the above
> taken care of?

Attached.