Fixed vip-like shuffling, and added more sensible loop behaviour