A few features/improvements

Hey, I've added a few commits to my own fork of the plugin.  Feel free to pull some or all of them.