latest toy code
fixed generation quirk to fix overcoverage of errors