updated utilfuncs to include more lineshapes, moving toward rationalizing models