Improved some things.

You should definitely include this, because I improved things.