fix timeouts and better error handle