modifying for my beers and fixing a display issue or two