double tap bug fixes
merge