Okay, I think this revision makes the changes people suggested.