More statistics and minor bugfixes