added A2 to u11 + minor fixes (handed in version)