add more data and clean up output