Changing what goes into the Mark data structure

guild and species don't need to be coded as dummy variables.