Hi Devin,

thank you very much for the patches. I made a rough review and applied the patches and also added 2 small patches to fix things.

Best regards

Toby