Version 2.0 Final polishing

I do believe that this is the RC.