More tea types and a bugfix.