major progress on completeness check code