Dev update.

Stuff from master, some small new things.