Improve report
Add some fun