started consolidating stuff into WAMP v2 spec