more checks; org fix