Fix user.touch
Fixes to Mash.