Misc:

- Few bugfixes
- Update docs