client card and other changes