catch up

Howdy Patty, this pull request is to catch your fork up to a bunch of changes I made earlier today.  Afterwards, I'll be able to merge your updates.