more shuffling fixes