Minor tweaks
Merge branch 'develop' into feature/coverage
Some data visualization
Merged