Adding new statistics and bugfixes