small updates for client side