fixed empty stats issue
added awesome idea to TODO list