Fixed shuffling, deleted defaultSchema saves, debugged/fixed most of the substitution shuffling