some clean up and outputting some new info