minor refactorings
improved match statistics view