fix more dates and formatting