refined discovery registration and a few other things