add watch to usage; other usage changes