Yup, BTTT on what you said! I loved it, and have seen the original at least 25 times. I didn’t like the PC nuns (my mom lived in Austria during that time and there wasn’t that “diversity”) or the Gretl actress, but everything else was fabulous.
Guess Jesse Jackson got to the NBC brass and read them the riot act if they didn't include some minorities.