NYC, State Agree On $8.5B Penn Station Overhaul Funding