Several modifications on the structure.

Also some minor changes in the text