[feat] fixes