add a cocktail, minor changes
Merge branch 'master' of https://github.com/rfjakob/barwin-pc