random/repeat works again, better swipes

some ugly hacks, but it works now