minor cleanup
added leader, machines and watch
watchIndex and watchCustom