feat: minor core improvements and refactors