small changes
moved Client stuff to the right proxy
code cleanup