update for new result format + format output a bit