Hi,

Here is a new version of the patch that includes all your improvements.