Now seems to timeout
Minor debug output and timeout tweaks