activated typechecker + improved tree