Tweaked gestures, cleaned up code.