Some reversions, some additional adjustments. Overall, I've tried to make things more natural, at least for American English.