diff --git a/todo.md b/todo.md
index 384e148..b2ca045 100644
--- a/todo.md
+++ b/todo.md
@@ -10,7 +10,6 @@
 	* type conversion rules
 	* CompareValidator::clientValidateAttribute(): search for "CHtml::activeId"
 	* FileValidator, UniqueValidator, ExistValidator, DateValidator: TBD
-	* consider merging UniqueValidator and ExistValidator and using a NOT property: array('!exist', …)
 	* when getting errors from getErrors it will be good to have which validator (at least type) failed exactly.
 - built-in console commands
 	+ api doc builder
diff --git a/upgrade.md b/upgrade.md
index 42faf82..ec101d4 100644
--- a/upgrade.md
+++ b/upgrade.md
@@ -17,7 +17,7 @@ General upgrade instructions
 - Replace 'framework' dir with the new one or point Git to a fresh
   release tag and checkout.
 - Check if everything is OK, if not — revert to previous stable version and post
-  issues to [Yii issue tracker](https://github.com/yiisoft/yii/issues).
+  issues to [Yii issue tracker](https://github.com/yiisoft/yii2/issues).
 
 
 Upgrading from v1.1.x
@@ -31,9 +31,9 @@ Upgrading from v1.1.x
 - The root alias `@yii` now represents the framework installation directory.
    In 1.x, this is named as `system`. We also removed `zii` root alias.
 
-- Object serves as the base class that supports properties. And Component extends
-  from Object and supports events and behaviors. Behaviors declared in
-  Component::behaviors() are attached on demand.
+- `Object` serves as the base class that supports properties. And `Component` extends
+  from `Object` and supports events and behaviors. Behaviors declared in
+  `Component::behaviors()` are attached on demand.
 
 - `CList` is renamed to `Vector`, and `CMap` is renamed to `Dictionary`.
   Other collection classes are dropped in favor of SPL classes.