Dried to fix various bugs....