Little enhancements

Hey Joey,

I was just about to start coding this extension when I discovered that you did already. Great job :thumbsup: :)
I adjusted it a bit to suit me better and thought you might want to adopt these changes ;)