Improve report + add graph