large repair on OSTI. Be more picky about TOCs for IoP, test update for IPAP