Updates on the presentation and other minor fixes