- Implemented missing methods
- Debug
- Code cleanup