[feature] More fixes and refactoring