files tidy and gesture fix