fixed and improved coffee class version - now the default and recommended
merged and more fixes