Slightly expand vocab
Fix tea-round bug