changes and more changes... bugs and more bugs....