added timeouts configs; fixed errer handling