fix + feat + improvement