gitignore, watching and other fixes