NSF looking OK in revised stimulus bill

Just downloaded what I think is the current bill that the House just passed for the stimulus.  And it looks like the National Science Foundation is coming out OK.  It says

NATIONAL SCIENCE FOUNDATION
NSF is directed to submit to the House and Senate Committees on
Appropriations a spending plan, signed by the Director, detailing its intended
allocation offunds provided in this Act within 60 days of enactment of this Act.
RESEARCH AND RELATED ACTIVITIES

For research and related activities, the conference agreement provides a total
of $2,500,000,000, to remain available until September 30,2010. Within this
amount, $300,000,000 shall be available solely for the major research
instrumentation program and $200,000,000 shall be available for activities
authorized by title II of Public Law 100-570 for academic facilities modernization.
In allocating the resources provided under this heading, the conferees direct that
NSF support all research divisions and support advancements in supercomputing
technology.

EDUCATION AND HUMAN RESOURCES
The conference agreement includes $100,000,000 for education and human
resources, to remain available until September 30, 2010. These funds shall be
allocated as follows:
Robert Noyce Scholarship Program .......................... .
Math and Science Partnerships ................................. .
Professional Science Master's Programs .................. .
$60,000,000
25,000,000
15,000,000
MAJOR RESEARCH EQUIPMENT AND FACILITIES CONSTRUCTION
The conference agreement includes $400,000,000 for major research
equipment and facilities construction, to remain available until September 30,
2010.
OFFICE OF INSPECTOR GENERAL
The conference agreement includes $2,000,000 for the Office of Inspector
General, to remain available until SeptemberJO, 2013.

"