More speed options & enhancements.

Intentionally removed the total result counter - this data was eating up
a lot of time.