- multiple bugfixes

- multiple bugfixes
- major features added