some improvements in client exports