Allow websocket fns to take kwargs.
Clean up stop to have clearer arglists.