cleanup and fixed the plugin - maybe
more cleanup