Clean up touch code a little
Switch to P2 physics