changes to make the plugin better
more improvements