Changed some statistic queries and outputs