minor improvements

adding watchdog and adjusting behavior in case of no response