big shuffle, minor tweaks