working on cocktail setting and minor changes