Fix grid structure and min tracking to match the style that worked in the high mass run.