several more checks and tests