diff --git a/ROADMAP.md b/ROADMAP.md
index c9f88de0..78c24152 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -10,9 +10,9 @@ Note `*` _for sustancial progress_
 2. [ ] Continuous integration with Jenkins
 2. [x] Admin interface based on django.contrib.admin
 3. [x] REST API for users
-2. [x] [Orchestra-orm](https://github.com/glic3rinu/orchestra-orm) a Python library for easily interacting with the REST API
+2. [x] [Orchestra-orm](https://github.com/glic3rinu/orchestra-orm) a Python library for easily interacting with Orchestra REST API
 3. [x] Service orchestration framework
-4. [ ] Data model, input validation, admin and REST interfaces, permissions, unit and functional tests, service management, migration scripts and documentation of:
+4. [ ] Data model, crazy input validation, admin and REST interfaces, permissions, unit and functional tests, service management, migration scripts and documentation of:
     1. [x] PHP/static Web applications
     1. [x] Websites with Apache
     2. [ ] *FTP/rsync/scp/shell system accounts
@@ -21,7 +21,7 @@ Note `*` _for sustancial progress_
     1. [x] DNS with Bind
     1. [ ] *Mailing lists with Mailman
 1. [x] Contact management and service contraction
-1. [ ] *Unittests of the bussines logic logic
+1. [ ] *Unittests of the bussines logic
 2. [ ] *Functional tests of all Admin UI and REST interations
 1. [ ] Initial documentation
 
@@ -30,7 +30,7 @@ Note `*` _for sustancial progress_
 
 1. [x] Resource allocation and monitoring
 1. [x] Order tracking
-2. [x] Service definition, service plans and pricing
+2. [x] Service definition framework, service plans and pricing
 3. [ ] *Billing
     3. [x] Invoice
     3. [x] Membership fee