tidyup, and add option to add throttling