Bug fixes and report

Some minor bug fixes and the addition of the Report