almost finished with quality of information, other small changes
Merge branch 'mathilde'