add an output to taf format and clean minor stuff