incremental client fixes, in progress