more swipeout fixes..