Olympic law rewrite calls for public funding for SafeSport and federal grassroots sports office