lots of changes to improve avatar touch 

(I had to disable a few bits relating to shaking hands but those will be put back in soon)