improvements to the build tasks and watch