Fixed some minor things.

And added some minor stuff.