Improved generator, added response waiter, and more