Client improvements

moved some more functions to improve flow of the Client object