bug fix and gesture tweak