- Bugs fixes, refactor, improvements