Cleaned things up a bit. Better Swipe detection.