- added more methods
- fixed some bugs