Debugging - 2 more errors found