Ability to scan watch only address. Various bug fixes