added uniform query...
completed debugging and added extras.
Fixed some misspellings...
more changes.