Fixed some typos and added ClientExtended- fixed some bugs