minor bug fixes. renaming a few xml tags.