Add many additional media stats
Apply code review feedback