flavors, oneOffs style + bug fix