Osaka makes much-anticipated return, Simone Biles targets Olympic history