adding more statistics. Still ugly looking but it works

This is almost the last push before merging the develop into master for release.