Forgot to add the plugin itself. Also some improvements