Fixed the docs according to the latest analysis. Added a TODO list