spelling and regex refinements