refactored, fixed double tap to rotate