changes mostly in withinday; some comments elsewhere