fix several bugs....