fix swipe helpers to somewhat work, might need more adjustments