Pushed, with changes/fixes.

Thanks for the patches and patience.

Regards,
RG.