changed some variable names
test without touchend
added back the touch
minor
Merge branch 'local'