updated node markup and handling