Some quick edits

[boucadair]

I need to go through all the changes and check against my comments. Here are some early edits on the intro + some fixes

[kalirajv]

Addressing comments via a new commit. Discarding this change request.