*8094* Fixed function changes; cleaned up PluginHandler
*8094* Fixed function changes; cleaned up PluginHandler