Some generation fixes (need to look at pre-validate some more) Bumped up escape assist values in non-basic shuffles