timeout for regular listner threads, plus some minor fixes