feat: major improvements and refactors