Various improvements

see commits for detailed description :)

Because there are no core code changes this doesn't needs publishing to npm I guess...