Cleaning up and using two handed control

It now uses your right hand for control only when the left hand is also
present.