more debug, fixed node detection