Issue #246 - fix vet errors, simplify WS check sig

* address r? from PR 249