added a couple of better completeness checks