now prints correct xml data for each hop in trace + various minor improvements