Update timeouts, final touches