Fixes and a change in mouthwash

Some small fixes