latest updates to bathe-plugin to clean up the run mechanism