[bugfixes]
- fixing this and that