[bugfixes]
- various fixes