bundle catchup
a bunch of updates

It's been too long - I declare clean commit message bankruptcy! Getting
back on the wagon for any further changes.