Debugging shuffling bug. Minor tweaks to other files