more work on client generator