Some improvements to various things.