More information in report and some changes in hpp files.