Fix up some pattern management, more complete IT.