New touch events handling and other changes