changes in general classes Matt and MattData

changes in general classes Matt and MattData for FES