Further refinement, mostly how to add plugins