final wording adjustments and some minor coffee refactoring