Some improvements to some things.