fix watch
fix templates