Fixed a few things.
Fixed a few more bugs.