Add more beers and fix some bugs

Signed-off-by:pdrolourenco@gmail.com <pdrolourenco@gmail.com>