Adding new statistics and bugfixes
Fix identation