Some bug fixes. Make the plugin work better on Windows.