add a few more checks