Miscellanouse minor fixes.  Added toString() to each beverage type.