fixes
statistics still not working well