Updates

- Simplify some methods (recursive)
- Adding new methods.