Fix errors in swipe-mode-alist and some cleanups