feat: refactor and general improvements (in progress)