adjusted pinch and zoom sequence and cleaned up