Made sections more relatable to our product

Correct some todo's while added some new, that I cannot answer. Added
todo's the places where I feel that it is important that Martin read new
material.