catch errors better, increase timeouts