Pull in recent updates

This is a collection of recent improvements.