issue-33

- Docs updated
- fix some bugs