did a little editing - don't want to have to do a complicated merge late...

...r so I'm pushing it up now