foolproofing UI, fixed client mapping'