Take into account some of the remaining reviews

I am lacking time to do more than this.
Rework a few graphs to please reviewers