fix watch + improve coffee