Added quote client, fixed errors in both