Beginning to fix errors