Statistics are working, fixed bugs