Tidying and TODO notes
Merge pull request #411 from plomino/jean-tidying

Tidying and TODO notes