Adding more checks, noticing more problems.