MODIFIED: documentation

General modifications to the  documentation and removed some old fixed TODOs.