Some modifications and suggestions

I warned you :-) I like the idea of the Extension so much that I made some modifications and (in my opinion) enhancements. The commit messages should explain what's going on.