fixes template path and body
implemented watch