fixed throttling, improved performance, added listing