Minor config cleanup, reducing pool wait times, updating to modified executor