Improved some things.