My mods to the bartendro sources