dataplug: discovery, fixes