I am with you on the second point; WW2 in Europe was a continuation of WW1, while concurrently there was an Asia-Pacific war starting with Japanese incursions into Korea and Manchuria.