xFirst review: see the diff and TODO's

This one will be just a poster paper.
We must reduce to 2 pages.