more inspector and evaluation changes