relay: multiple updates

* fix up a lot more stuff and start wiring stuff together to make things work again