some report, some tidying
merge