Fixing a few things.

Check back soon!