Touched up clientsetup