improve output formating
update heuristics