Jeffs dump local changes

Remaining unsync'd changes from my local repo.