Lots of enhancements and extensions

[hupfdule]

This is actually not an honest Pull Request, but just a note of the existence of my fork.

It contains a lot of changes. So many changes that I doubt you would want to integrate all of them into your original version.

So feel free to cherry-pick some changes you are interested in and ignore the rest of them.