Fixed base plugin vs plugin. Improved watch and serve tasks.