Finished to include the tikz figures + minor modifs