discovery: address comments