Minor fixes: using thread pool, AND regexp