Fix for websocket handshake changes + many contributed enhancements