Nadal back, women cash in at revamped China Open