revising relays; some more fixes