swapped out touchswipe with hammer, cleaned up a couple options