lots of update and a to a report for mocha
follow up to last commit