SaveMovePlay changes for Mark

Also change SaveSubstitutionPlay, cleanup/organization