client-state work

client-state modifications

client-state build corrections