Comments & report

And some small fixes