Additions to report. Handle a couple of TODO's, added some others.