fixed pats stuff mostly