Fixed bugs.

And stuff...