add cachebuster, refactor a bit of swipe logic
merge