improved flavor handling