Fixed a few bugs and added SwipeCancel