feat(core): major improvements and bugfixes