Use grid-protocol

And small tweaks into signal-ws