Upgraded watch to use dynamic extensions as well
Correcting linting annoyances