Merged Max's touch-to-pinch changes, now with most recent version of renderer code