- fixes
- start implementing statistics