Complete config of the plugin and some adjustments