Bug fixes and added gestures