work on fixes for client