More adjustments. Added field.final in verification.