Various. I'll get around to clean commits soon.

When the base is stable, that is.