various changes for the plugin's mechanics