Pull in dev changes

Fix *all* (or some) of the things!