Now that we have a short timeout we don't need to switch between interactive and non-interactive
mode, which gives us one less layer of complexitey

Also tidy some debug stuff.