Makefile improvements
Makefile improvements
Make fix
Dev improvements
Build watcher