Removed TODO and corrected js for websocket.