Fixed a few bugs....