extending timeouts, adding debugging