(maint) updates... like lots of them

Lots of good stuff