added notices
added comment and fixed handling of watched files