- many small fixes
- more test data