longer timeout, better logging