minor refactoring of plugin steps, WIP
fixed plugins