- fixed discovery timeout (stops at first timeout) and cleaned up from
spurious commit