fix bugs and improve appearance of stats