Test branch

Please review the change made to gestureFilter. All other changes are just tests that can only help! 
That would be an obvious yes. And it took me about 5 read throughs to spot the difference.