small updates to Drink and DrinkDb